From 1f31f01f9c0ad73a70a9e3dd23c9d8ec27fd1792 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 28 Aug 2017 17:44:44 -0700 Subject: Upgrade to sbt 1.0.1 --- plugin/src/sbt-test/sbt-jni/multiclasses/build.sbt | 4 +--- plugin/src/sbt-test/sbt-jni/simple/build.sbt | 3 +-- plugin/src/sbt-test/sbt-jni/simple/project/build.properties | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'plugin/src/sbt-test') diff --git a/plugin/src/sbt-test/sbt-jni/multiclasses/build.sbt b/plugin/src/sbt-test/sbt-jni/multiclasses/build.sbt index c1352d9..d12a711 100644 --- a/plugin/src/sbt-test/sbt-jni/multiclasses/build.sbt +++ b/plugin/src/sbt-test/sbt-jni/multiclasses/build.sbt @@ -5,9 +5,7 @@ lazy val root = (project in file(".")). lazy val core = (project in file("core")). dependsOn(native1 % Runtime). - dependsOn(native2 % Runtime). - dependsOnRun(native1). - dependsOnRun(native2) + dependsOn(native2 % Runtime) lazy val native1 = (project in file("native1")). settings(sourceDirectory in nativeCompile := sourceDirectory.value). diff --git a/plugin/src/sbt-test/sbt-jni/simple/build.sbt b/plugin/src/sbt-test/sbt-jni/simple/build.sbt index b3d441a..cd490b0 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/build.sbt +++ b/plugin/src/sbt-test/sbt-jni/simple/build.sbt @@ -6,8 +6,7 @@ lazy val root = (project in file(".")). lazy val core = (project in file("core")). settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.0" % "test"). settings(target in javah := (sourceDirectory in nativeCompile in native).value / "include"). - dependsOn(native % Runtime). - dependsOnRun(native) + dependsOn(native % Runtime) lazy val native = (project in file("native")). settings(sourceDirectory in nativeCompile := sourceDirectory.value). diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties index 94005e5..7b6213b 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties +++ b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.0 +sbt.version=1.0.1 -- cgit v1.2.3