aboutsummaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-06-16 13:38:51 -0700
committerJakob Odersky <jakob@odersky.com>2016-06-16 13:38:51 -0700
commit8856ff6ab97bd3c47cebec74fff5645246264b58 (patch)
tree15ca02cd8fb66dd3e4a57412aa12a884cffe8c9d /plugin
parentcd30d189f038f7ddc2b518d3f17b8c6ff82f77dc (diff)
downloadsbt-jni-8856ff6ab97bd3c47cebec74fff5645246264b58.tar.gz
sbt-jni-8856ff6ab97bd3c47cebec74fff5645246264b58.tar.bz2
sbt-jni-8856ff6ab97bd3c47cebec74fff5645246264b58.zip
Add tests and process.lines for Scala 2.10
Diffstat (limited to 'plugin')
-rw-r--r--plugin/src/sbt-test/sbt-jni/multiclasses/test4
-rw-r--r--plugin/src/sbt-test/sbt-jni/oneproject/test4
-rw-r--r--plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala3
-rw-r--r--plugin/src/sbt-test/sbt-jni/simple/test6
4 files changed, 9 insertions, 8 deletions
diff --git a/plugin/src/sbt-test/sbt-jni/multiclasses/test b/plugin/src/sbt-test/sbt-jni/multiclasses/test
index e9e0d97..d48dff0 100644
--- a/plugin/src/sbt-test/sbt-jni/multiclasses/test
+++ b/plugin/src/sbt-test/sbt-jni/multiclasses/test
@@ -1,2 +1,2 @@
-> javah
-> core/run \ No newline at end of file
+> +javah
+> +core/run \ No newline at end of file
diff --git a/plugin/src/sbt-test/sbt-jni/oneproject/test b/plugin/src/sbt-test/sbt-jni/oneproject/test
index 2c485fa..008dde3 100644
--- a/plugin/src/sbt-test/sbt-jni/oneproject/test
+++ b/plugin/src/sbt-test/sbt-jni/oneproject/test
@@ -1,4 +1,4 @@
-> javah
+> +javah
$ exists src/native/include/simple_Library__.h
> nativeInit cmake demo
-> run \ No newline at end of file
+> +run \ No newline at end of file
diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala
index cd63c89..bfec913 100644
--- a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala
+++ b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala
@@ -7,7 +7,8 @@ object ScriptedHelper extends AutoPlugin {
override def trigger = allRequirements
override def projectSettings = Seq(
- crossScalaVersions := Seq("2.11.8", "2.12.0-M4"),
+ scalacOptions ++= Seq("-feature", "-deprecation"),
+ crossScalaVersions := Seq("2.11.8", "2.10.6", "2.12.0-M4"),
scalaVersion := crossScalaVersions.value.head
)
diff --git a/plugin/src/sbt-test/sbt-jni/simple/test b/plugin/src/sbt-test/sbt-jni/simple/test
index 84a1622..919adf2 100644
--- a/plugin/src/sbt-test/sbt-jni/simple/test
+++ b/plugin/src/sbt-test/sbt-jni/simple/test
@@ -1,5 +1,5 @@
-> javah
+> +javah
$ exists native/src/include/simple_Library__.h
> nativeInit cmake demo
-> test
-> core/run \ No newline at end of file
+> +test
+> +core/run \ No newline at end of file