diff options
author | Jakob Odersky <jodersky@gmail.com> | 2016-01-18 19:18:39 -0800 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2016-01-18 19:18:39 -0800 |
commit | 5521a9377fa35278e2407ab13b26f86b5ce4eb36 (patch) | |
tree | 4a2412b4aa78c3ffdc761c798107c680dc15f5f4 | |
parent | 79efadf3152bd2b0dc2c3ef194e2b200197547ed (diff) | |
download | akka-serial-5521a9377fa35278e2407ab13b26f86b5ce4eb36.tar.gz akka-serial-5521a9377fa35278e2407ab13b26f86b5ce4eb36.tar.bz2 akka-serial-5521a9377fa35278e2407ab13b26f86b5ce4eb36.zip |
upgrade sbt-jni plugin
-rw-r--r-- | flow-main/build.sbt | 12 | ||||
-rw-r--r-- | flow-native/build.sbt | 8 | ||||
-rw-r--r-- | flow-samples/terminal/build.sbt | 3 | ||||
-rw-r--r-- | flow-samples/watcher/build.sbt | 3 | ||||
-rw-r--r-- | project/Dependencies.scala | 9 | ||||
-rw-r--r-- | project/FlowBuild.scala | 20 | ||||
-rw-r--r-- | project/plugins.sbt | 2 |
7 files changed, 40 insertions, 17 deletions
diff --git a/flow-main/build.sbt b/flow-main/build.sbt index a852935..0206b40 100644 --- a/flow-main/build.sbt +++ b/flow-main/build.sbt @@ -1,10 +1,14 @@ -enablePlugins(JniJvm) +import flow.{FlowBuild, Dependencies} + +FlowBuild.commonSettings + +libraryDependencies += Dependencies.akkaActor //there are also java sources in this project compileOrder in Compile := CompileOrder.Mixed -libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.4.1" +name := "flow" -target in (Compile, javah) := (baseDirectory in ThisBuild).value / "flow-native" / "src" / "src" +enablePlugins(JniLoading) -name := "flow" +target in javah in Compile := (baseDirectory in ThisBuild).value / "flow-native" / "src" / "src" diff --git a/flow-native/build.sbt b/flow-native/build.sbt index b175e05..b6b39a0 100644 --- a/flow-native/build.sbt +++ b/flow-native/build.sbt @@ -1,3 +1,9 @@ +import flow.{FlowBuild} + +FlowBuild.commonSettings + enablePlugins(JniNative) -jniLibraryPath in (Compile, jni) := "com/github/jodersky/flow" +sourceDirectory in nativeCompile in Compile := sourceDirectory.value + +nativeLibraryPath in Compile := "com/github/jodersky/flow" diff --git a/flow-samples/terminal/build.sbt b/flow-samples/terminal/build.sbt new file mode 100644 index 0000000..5fbdd89 --- /dev/null +++ b/flow-samples/terminal/build.sbt @@ -0,0 +1,3 @@ +import flow.{FlowBuild} + +FlowBuild.commonSettings diff --git a/flow-samples/watcher/build.sbt b/flow-samples/watcher/build.sbt new file mode 100644 index 0000000..5fbdd89 --- /dev/null +++ b/flow-samples/watcher/build.sbt @@ -0,0 +1,3 @@ +import flow.{FlowBuild} + +FlowBuild.commonSettings diff --git a/project/Dependencies.scala b/project/Dependencies.scala new file mode 100644 index 0000000..d051938 --- /dev/null +++ b/project/Dependencies.scala @@ -0,0 +1,9 @@ +package flow + +import sbt._ + +object Dependencies { + + val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.1" + +} diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index ca76638..be1b7ef 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -1,12 +1,14 @@ +package flow + import sbt._ import Keys._ object FlowBuild extends Build { val scalaVersions = List("2.11.7", "2.12.0-M3") - + lazy val commonSettings: Seq[Setting[_]] = Seq( - version := "2.4.0-M2", + version := "2.4.0-RC1", scalaVersion in ThisBuild := scalaVersions.head, crossScalaVersions in ThisBuild := scalaVersions.reverse, scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-target:jvm-1.8"), @@ -42,28 +44,24 @@ object FlowBuild extends Build { lazy val main = Project( id = "flow-main", - base = file("flow-main"), - settings = commonSettings + base = file("flow-main") ) lazy val native = Project( id = "flow-native", - base = file("flow-native"), - settings = commonSettings + base = file("flow-native") ) - + lazy val samplesTerminal = Project( id = "flow-samples-terminal", base = file("flow-samples") / "terminal", - settings = commonSettings, dependencies = Seq(main, native % Runtime) ) - + lazy val samplesWatcher = Project( id = "flow-samples-watcher", base = file("flow-samples") / "watcher", - settings = commonSettings, dependencies = Seq(main, native % Runtime) ) - + } diff --git a/project/plugins.sbt b/project/plugins.sbt index 67f075f..edd4ad3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("ch.jodersky" %% "sbt-jni" % "0.2-SNAPSHOT") +addSbtPlugin("ch.jodersky" %% "sbt-jni" % "0.3.0") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3") |