Expose settings to allow for more granular control

Author: kiendang

src/main/scala/ai/kien/scalapy/plugin/ScalaPyJVMPlugin.scala

@@ -67,4 +67,7 @@ object ScalaPyJVMPlugin extends AutoPlugin {
         "scalapy.python.programname" -> scalapyPythonProgramName.value
       ).map { case (k, v) => s"""-D$k=$v""" }.toSeq
   )
+
+  lazy val scalapySettings: Seq[Setting[_]] =
+    projectSettings ++ ScalaPyPlugin.projectSettings
 }

src/main/scala/ai/kien/scalapy/plugin/ScalaPyNativePlugin.scala

@@ -26,4 +26,7 @@ object ScalaPyNativePlugin extends AutoPlugin {
     ).value,
     nativeLinkingOptions ++= scalapyLinkingOptions.value
   )
+
+  lazy val scalapySettings: Seq[Setting[_]] =
+    projectSettings ++ ScalaPyPlugin.projectSettings
 }

src/sbt-test/jvm/split/build.sbt

@@ -0,0 +1,20 @@
+import scala.util.Properties
+import ai.kien.scalapy.plugin.ScalaPyJVMPlugin.scalapySettings
+
+lazy val root = project
+  .in(file("."))
+  .settings(
+    libraryDependencies ++= Seq(
+      "me.shadaj" %% "scalapy-core" % "0.5.2",
+      "org.scalatest" %% "scalatest" % "3.2.11" % Test
+    ),
+    inConfig(Test)(scalapySettings)
+  )
+
+lazy val pythonExecutable = Properties.propOrNone("plugin.python.executable")
+
+inThisBuild(
+  pythonExecutable
+    .map(p => Def.settings(scalapyPythonExecutable := p))
+    .getOrElse(Def.settings())
+)

src/sbt-test/jvm/split/project/.gitignore

@@ -0,0 +1 @@
+project/

src/sbt-test/jvm/split/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.7.1

src/sbt-test/jvm/split/project/plugins.sbt

@@ -0,0 +1,10 @@
+sys.props.get("plugin.version") match {
+  case Some(v) => addSbtPlugin("ai.kien" % "sbt-scalapy" % v)
+  case _ =>
+    sys.error(
+      """|The system property 'plugin.version' is not defined.
+         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
+    )
+}
+
+libraryDependencies += "ai.kien" %% "python-native-libs" % "0.2.3"

src/sbt-test/jvm/split/src/main/scala/Main.scala

@@ -0,0 +1,18 @@
+import me.shadaj.scalapy.py
+import me.shadaj.scalapy.py.{PyQuote, SeqConverters}
+
+import scala.util.{Try, Success, Failure}
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    (try {
+      py.Dynamic.global.list(Seq(1, 2, 3).toPythonCopy)
+      Success(true)
+    } catch {
+      case t: Throwable => Failure(t)
+    }) fold (
+      t => println(s"Successfully failed with $t}"),
+      _ => sys.error("This should not succeed")
+    )
+  }
+}

src/sbt-test/jvm/split/src/test/scala/PythonTest.scala

@@ -0,0 +1,13 @@
+import me.shadaj.scalapy.py
+import me.shadaj.scalapy.py.{PyQuote, SeqConverters}
+import org.scalatest.funsuite.AnyFunSuite
+
+class PythonTest extends AnyFunSuite {
+  test("ScalaPy runs successfully") {
+    py.Dynamic.global.list(Seq(1, 2, 3).toPythonCopy)
+    py"'Hello from ScalaPy!'"
+    if (System.getenv.containsKey("CI_VIRTUALENV")) {
+      println(s"Successfully load ${py.module("dummy")}")
+    }
+  }
+}

src/sbt-test/jvm/split/test

@@ -0,0 +1,2 @@
+> run
+> test

src/sbt-test/scalanative/split/build.sbt

@@ -0,0 +1,36 @@
+import scala.util.Properties
+import ai.kien.scalapy.plugin.ScalaPyNativePlugin.scalapySettings
+
+lazy val root = project
+  .in(file("."))
+  .enablePlugins(ScalaNativePlugin)
+  .settings(
+    libraryDependencies ++= Seq(
+      "me.shadaj" %%% "scalapy-core" % "0.5.2" % Test,
+      "org.scalatest" %%% "scalatest" % "3.2.10" % Test
+    ),
+    inConfig(Test)(scalapySettings),
+    TaskKey[Unit]("check") := {
+      println(
+        s"Compile / nativeLinkingOptions == ${(Compile / nativeLinkingOptions).??(Seq[String]()).value}"
+      )
+      println(
+        s"Test / nativeLinkingOptions == ${(Test / nativeLinkingOptions).value}"
+      )
+      if (
+        (Compile / nativeLinkingOptions)
+          .??(Seq[String]())
+          .value == (Test / nativeLinkingOptions).value
+      ) {
+        sys.error("Settings from ScalaPyNativePlugin should not have been applied to Compile.")
+      }
+    }
+  )
+
+lazy val pythonExecutable = Properties.propOrNone("plugin.python.executable")
+
+inThisBuild(
+  pythonExecutable
+    .map(p => Def.settings(scalapyPythonExecutable := p))
+    .getOrElse(Def.settings())
+)