From 042fe381c2a2d1f5b1e1235930841222651297ea Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 18 Jul 2019 12:05:32 +0200 Subject: [PATCH 1/2] Run sbt-lm-coursier tests with JDK11 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index efef3f55e..3b5d6c3a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,9 @@ jobs: - env: SBT_SHADING=1 - env: SBT_PGP_COURSIER=1 - env: LM_COURSIER=1 TEST_GROUP=1 + jdk: openjdk11 - env: LM_COURSIER=1 TEST_GROUP=2 + jdk: openjdk11 - stage: release script: ./sbt ci-release branches: From bb7de44c381f8323f4eac228dfbb96f289316668 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 4 Feb 2020 20:12:37 +0100 Subject: [PATCH 2/2] Remove 2.11 tests --- .../typelevel-force-version-stdlib/build.sbt | 6 ------ .../project/plugins.sbt | 13 ------------- .../src/main/scala/Main.scala | 8 -------- .../scala-211/typelevel-force-version-stdlib/test | 3 --- .../scala-211/typelevel-with-dependencies/build.sbt | 9 --------- .../typelevel-with-dependencies/project/plugins.sbt | 13 ------------- .../src/main/scala/Foo.scala | 5 ----- .../scala-211/typelevel-with-dependencies/test | 1 - .../src/sbt-test/scala-211/typelevel/build.sbt | 3 --- .../scala-211/typelevel/project/plugins.sbt | 13 ------------- .../scala-211/typelevel/src/main/scala/Main.scala | 8 -------- .../src/sbt-test/scala-211/typelevel/test | 3 --- scripts/travis.sh | 4 ---- 13 files changed, 89 deletions(-) delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/src/main/scala/Main.scala delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/src/main/scala/Foo.scala delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel/test diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt deleted file mode 100644 index 2cc50fde5..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt +++ /dev/null @@ -1,6 +0,0 @@ -scalaOrganization := "org.typelevel" -scalaVersion := "2.11.7" -scalacOptions += "-Xexperimental" - -// no effect, as the right version is forced anyway (to scalaVersion.value) -libraryDependencies += "org.typelevel" % "scala-library" % "2.11.12345" diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/src/main/scala/Main.scala deleted file mode 100644 index 32ca74bee..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/src/main/scala/Main.scala +++ /dev/null @@ -1,8 +0,0 @@ -import java.io.File -import java.nio.file.Files - -object Main extends App { - val n': 2.type = 2 - - Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) -} diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test deleted file mode 100644 index 2182f57b0..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test +++ /dev/null @@ -1,3 +0,0 @@ -$ delete output -> run -$ exists output diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt deleted file mode 100644 index e471a3c28..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt +++ /dev/null @@ -1,9 +0,0 @@ - -scalaVersion := "2.12.2-bin-typelevel-4" -scalaOrganization := "org.typelevel" -scalacOptions += "-Yinduction-heuristics" - -libraryDependencies ++= Seq( - "com.47deg" %% "freestyle" % "0.1.0", - compilerPlugin("org.scalamacros" %% "paradise" % "2.1.1" cross CrossVersion.patch) -) diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/src/main/scala/Foo.scala deleted file mode 100644 index cf64974eb..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/src/main/scala/Foo.scala +++ /dev/null @@ -1,5 +0,0 @@ -import freestyle._ - -@free trait Foo { - def bzz: FS[java.lang.String] -} diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test deleted file mode 100644 index 5df2af1f3..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test +++ /dev/null @@ -1 +0,0 @@ -> compile diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt deleted file mode 100644 index 6a6bacd66..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt +++ /dev/null @@ -1,3 +0,0 @@ -scalaOrganization := "org.typelevel" -scalaVersion := "2.11.7" -scalacOptions += "-Xexperimental" diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala deleted file mode 100644 index 32ca74bee..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala +++ /dev/null @@ -1,8 +0,0 @@ -import java.io.File -import java.nio.file.Files - -object Main extends App { - val n': 2.type = 2 - - Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) -} diff --git a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/test b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/test deleted file mode 100644 index 2182f57b0..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/test +++ /dev/null @@ -1,3 +0,0 @@ -$ delete output -> run -$ exists output diff --git a/scripts/travis.sh b/scripts/travis.sh index 6a8c67c3c..553ff1d3a 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -16,8 +16,6 @@ sbtShading() { runLmCoursierTests() { if [ "$TEST_GROUP" = 1 ]; then SCRIPTED_EXTRA="sbt-lm-coursier/*" - elif [ "$TEST_GROUP" = 2 ]; then - SCRIPTED_EXTRA="scala-211/*" else SCRIPTED_EXTRA="" fi @@ -34,8 +32,6 @@ runLmCoursierTests() { runSbtCoursierTests() { if [ "$TEST_GROUP" = 1 ]; then SCRIPTED_EXTRA="sbt-coursier/*" - elif [ "$TEST_GROUP" = 2 ]; then - SCRIPTED_EXTRA="scala-211/*" else SCRIPTED_EXTRA="" fi