From 8856ff6ab97bd3c47cebec74fff5645246264b58 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Thu, 16 Jun 2016 13:38:51 -0700 Subject: Add tests and process.lines for Scala 2.10 --- plugin/src/sbt-test/sbt-jni/multiclasses/test | 4 ++-- plugin/src/sbt-test/sbt-jni/oneproject/test | 4 ++-- plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala | 3 ++- plugin/src/sbt-test/sbt-jni/simple/test | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'plugin') 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 -- cgit v1.2.3