Refactor to multi-plugin build

6 files changed, 30 insertions, 22 deletions

diff --git a/samples/basic/basic-core/build.sbt b/samples/basic/basic-core/build.sbt
new file mode 100644
index 0000000..cd51bb3
--- /dev/null
+++ b/samples/basic/basic-core/build.sbt
@@ -0,0 +1 @@
+//enablePlugins(JniLoader)
diff --git a/samples/basic/basic-main/src/main/scala/ch/jodersky/jni/basic/Library.scala b/samples/basic/basic-core/src/main/scala/ch/jodersky/jni/basic/Library.scala
index efe3018..efe3018 100644
--- a/samples/basic/basic-main/src/main/scala/ch/jodersky/jni/basic/Library.scala
+++ b/samples/basic/basic-core/src/main/scala/ch/jodersky/jni/basic/Library.scala
diff --git a/samples/basic/basic-core/src/main/scala/ch/jodersky/jni/basic/Main.scala b/samples/basic/basic-core/src/main/scala/ch/jodersky/jni/basic/Main.scala
new file mode 100644
index 0000000..2aab1ed
--- /dev/null
+++ b/samples/basic/basic-core/src/main/scala/ch/jodersky/jni/basic/Main.scala
@@ -0,0 +1,13 @@
+package ch.jodersky.jni.basic
+
+import ch.jodersky.jni.NativeLoader
+
+object Main {
+
+  def main(args: Array[String]): Unit = {
+    NativeLoader.load("/ch/jodersky/jni/basic/native", "demo1")
+    val result: Int = Library.print("Hello world!\n")
+    println("Returned: " + result)
+  }
+
+}
diff --git a/samples/basic/basic-main/src/main/scala/ch/jodersky/jni/basic/Main.scala b/samples/basic/basic-main/src/main/scala/ch/jodersky/jni/basic/Main.scala
deleted file mode 100644
index b46f0d1..0000000
--- a/samples/basic/basic-main/src/main/scala/ch/jodersky/jni/basic/Main.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package ch.jodersky.jni.basic
-
-import ch.jodersky.jni.NativeLoader
-
-object Main {
-
-  def main(args: Array[String]): Unit = {
-    NativeLoader.load("/ch/jodersky/jni/basic", "demo1")
-    val r = Library.print("Hello world!\n")
-    println("Returned: " + r)
-  }
-
-}
diff --git a/samples/basic/build.sbt b/samples/basic/build.sbt
index cceeb16..7f5bedd 100644
--- a/samples/basic/build.sbt
+++ b/samples/basic/build.sbt
@@ -3,22 +3,29 @@ val commonSettings = Seq(
   organization := "ch.jodersky"
 )
 
-lazy val main = Project(
-  id = "sample-basic-main",
-  base = file("basic-main"),
+lazy val root = Project(
+  id = "root",
+  base = file("."),
+  aggregate = Seq(core, native)
+)
+
+lazy val core = Project(
+  id = "basic-core",
+  base = file("basic-core"),
   settings = commonSettings ++ Seq(
-    target in (Compile, javah) :=
-      (sourceDirectory in native).value / "include"
+    target in javah in Compile := (sourceDirectory in native).value / "include"
   ),
   dependencies = Seq(
     native % Runtime
   )
-).enablePlugins(JniJvm)
+).enablePlugins(JniLoading)
 
 lazy val native = Project(
-  id = "sample-basic-native",
+  id = "basic-native",
   base = file("basic-native"),
   settings = commonSettings ++ Seq(
-    jniLibraryPath in (Compile, jni) := "/ch/jodersky/jni/basic"
+    //enableNativeCompilation in Compile := false,
+    sourceDirectory in nativeCompile in Compile := sourceDirectory.value,
+    nativeLibraryPath in Compile := "/ch/jodersky/jni/basic/native"
   )
 ).enablePlugins(JniNative)
diff --git a/samples/basic/project/plugins.sbt b/samples/basic/project/plugins.sbt
index 08f838a..c683b30 100644
--- a/samples/basic/project/plugins.sbt
+++ b/samples/basic/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("ch.jodersky" % "sbt-jni" % "0.2-SNAPSHOT")
+addSbtPlugin("ch.jodersky" % "sbt-jni" % "0.3-SNAPSHOT")