diff --git a/appveyor.yml b/appveyor.yml index 8311496a1..edcd2ce14 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,7 +35,7 @@ test_script: - sbt ++2.12.1 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test? - sbt ++2.11.11 testsJVM/test testsJVM/it:test - sbt ++2.10.6 testsJVM/test testsJVM/it:test - - sbt ++2.12.1 "sbt-coursier/scripted sbt-coursier/*" sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*" # for sbt 1.0 + - sbt ++2.12.1 "sbt-coursier/scripted sbt-coursier/simple" sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*" # for sbt 1.0 - sbt ++2.10.6 "sbt-coursier/scripted sbt-coursier/*" "sbt-coursier/scripted sbt-coursier-0.13/*" sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*" "sbt-shading/scripted sbt-shading-0.13/*" # for sbt 0.13 cache: - C:\Users\appveyor\.ivy2\cache diff --git a/cli/src/main/scala-2.12/coursier/cli/Coursier.scala b/cli/src/main/scala-2.12/coursier/cli/Coursier.scala new file mode 100644 index 000000000..6cd201512 --- /dev/null +++ b/cli/src/main/scala-2.12/coursier/cli/Coursier.scala @@ -0,0 +1,6 @@ +package coursier.cli + +// dummy app to keep proguard quiet in 2.12 +object Coursier { + def main(args: Array[String]): Unit = {} +} diff --git a/scripts/travis.sh b/scripts/travis.sh index af69270c7..f882249bd 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -84,10 +84,13 @@ is212() { runSbtCoursierTests() { addPgpKeys - sbt ++$SCALA_VERSION sbt-plugins/publishLocal "sbt-coursier/scripted sbt-coursier/*" sbt-pgp-coursier/scripted + sbt ++$SCALA_VERSION sbt-plugins/publishLocal if [ "$SCALA_VERSION" = "2.10" ]; then - sbt ++$SCALA_VERSION "sbt-coursier/scripted sbt-coursier-0.13/*" + sbt ++$SCALA_VERSION "sbt-coursier/scripted sbt-coursier/*" "sbt-coursier/scripted sbt-coursier-0.13/*" + else + sbt ++$SCALA_VERSION "sbt-coursier/scripted sbt-coursier/simple" # full scripted suite currently taking too long on Travis CI... fi + sbt ++$SCALA_VERSION sbt-pgp-coursier/scripted } runSbtShadingTests() {