From df3d5c627a039e97c91386a246c888e5eed0c539 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 26 Jul 2019 12:07:11 +0200 Subject: [PATCH] Migrate most scripted tests away from scala 2.11 (#107) So that they can run with openjdk11 too --- .../sbt-test/sbt-coursier/dependency-graph/build.sbt | 2 +- .../sbt-test/sbt-coursier/in-memory-cache/build.sbt | 2 +- .../src/sbt-test/sbt-lm-coursier/evicted/build.sbt | 6 +++--- .../typelevel-force-version-stdlib/build.sbt | 0 .../typelevel-force-version-stdlib/project/plugins.sbt | 0 .../src/main/scala/Main.scala | 0 .../typelevel-force-version-stdlib/test | 0 .../typelevel-with-dependencies/build.sbt | 0 .../typelevel-with-dependencies/project/plugins.sbt | 0 .../src/main/scala/Foo.scala | 0 .../typelevel-with-dependencies/test | 0 .../{shared-2 => scala-211}/typelevel/build.sbt | 0 .../typelevel/project/plugins.sbt | 0 .../typelevel/src/main/scala/Main.scala | 0 .../sbt-test/{shared-2 => scala-211}/typelevel/test | 0 .../src/sbt-test/shared-1/aar-packaging/build.sbt | 2 +- .../shared-1/all-exclude-dependencies/build.sbt | 6 +++--- .../sbt-test/shared-1/all-exclude-dependencies/test | 2 +- .../src/sbt-test/shared-1/classifiers/build.sbt | 2 +- .../sbt-coursier/src/sbt-test/shared-1/clean/build.sbt | 2 +- .../shared-1/credentials-from-file-legacy/build.sbt | 2 +- .../sbt-test/shared-1/credentials-from-file/build.sbt | 2 +- .../src/sbt-test/shared-1/credentials-global/build.sbt | 2 +- .../src/sbt-test/shared-1/credentials-legacy/build.sbt | 2 +- .../sbt-test/shared-1/credentials-sbt-global/build.sbt | 2 +- .../src/sbt-test/shared-1/credentials-sbt/build.sbt | 2 +- .../src/sbt-test/shared-1/credentials/build.sbt | 2 +- .../sbt-test/shared-1/exclude-dependencies/build.sbt | 6 +++--- .../src/sbt-test/shared-1/exclude-dependencies/test | 2 +- .../fallback-dependencies-inter-project/build.sbt | 4 ++-- .../src/sbt-test/shared-1/from-no-head/build.sbt | 2 +- .../src/sbt-test/shared-1/from-wrong-url/build.sbt | 4 ++-- .../sbt-coursier/src/sbt-test/shared-1/from/build.sbt | 6 +++--- .../hadoop-yarn-server-resourcemanager/build.sbt | 2 +- .../b/src/main/scala/Main.scala | 7 +------ .../shared-1/inter-project-resolvers/build.sbt | 6 +++--- .../src/sbt-test/shared-1/inter-project/build.sbt | 10 +++++----- .../src/sbt-test/shared-2/maven-compatible/build.sbt | 8 ++++---- .../maven-compatible/src/main/scala/Main.scala | 7 +------ .../maven-plugin-classpath-type/project/plugins.sbt | 2 +- .../sbt-test/shared-2/missing-credentials/build.sbt | 2 +- .../src/sbt-test/shared-2/profiles/build.sbt | 6 +++--- .../shared-2/profiles/src/main/scala/Main.scala | 2 +- .../publish-local-sources-javadoc-conf/build.sbt | 2 +- .../src/sbt-test/shared-2/simple/build.sbt | 2 +- .../sbt-test/shared-2/whitespace-resolver/build.sbt | 2 +- .../src/sbt-test/shared-2/zookeeper/build.sbt | 2 +- scripts/travis.sh | 4 ++++ 48 files changed, 60 insertions(+), 66 deletions(-) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-force-version-stdlib/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-force-version-stdlib/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-force-version-stdlib/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-force-version-stdlib/test (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-with-dependencies/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-with-dependencies/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-with-dependencies/src/main/scala/Foo.scala (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel-with-dependencies/test (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{shared-2 => scala-211}/typelevel/test (100%) diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt index 1cd3d6a13..671c71f89 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" libraryDependencies += { sys.props("sbt.log.noformat") = "true" // disables colors in coursierWhatDependsOn output diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt index 0dbf9bbb4..f808c3249 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" coursierArtifacts := { val f = file("coursier-artifacts") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/build.sbt index 4cd9ffc8d..3073df20e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/build.sbt @@ -3,7 +3,7 @@ lazy val a = project .settings( - scalaVersion := "2.11.8", + scalaVersion := "2.12.8", libraryDependencies ++= Seq( "org.typelevel" %% "cats-effect" % "1.3.1", "org.typelevel" %% "cats-core" % "1.5.0" @@ -12,9 +12,9 @@ lazy val a = project lazy val b = project .settings( - scalaVersion := "2.11.8", + scalaVersion := "2.12.8", libraryDependencies ++= Seq( - "org.slf4s" %% "slf4s-api" % "1.7.12", // depends on org.slf4j:slf4j-api:1.7.12 + "org.slf4s" %% "slf4s-api" % "1.7.25", // depends on org.slf4j:slf4j-api:1.7.25 "ch.qos.logback" % "logback-classic" % "1.1.2" // depends on org.slf4j:slf4j-api:1.7.6 ) ) diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/build.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/build.sbt rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/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 similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/test b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/test rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-with-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-with-dependencies/build.sbt rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-with-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-with-dependencies/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/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 similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-with-dependencies/src/main/scala/Foo.scala rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/src/main/scala/Foo.scala diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-with-dependencies/test b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel-with-dependencies/test rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/build.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel/build.sbt rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/test b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/shared-2/typelevel/test rename to modules/sbt-coursier/src/sbt-test/scala-211/typelevel/test diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt index 97b5c2cff..d4295f81b 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" libraryDependencies += ("com.rengwuxian.materialedittext" % "library" % "2.1.4") .exclude("com.android.support", "support-v4") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt index 8c2b3c509..ca5e529b7 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt @@ -1,11 +1,11 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" organization := "io.get-coursier.test" name := "sbt-coursier-all-exclude-dependencies" version := "0.1.0-SNAPSHOT" -libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.1" % "1.0.0-RC1" +libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M11" -allExcludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.11") +allExcludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.12") allExcludeDependencies += "io.argonaut" %% "argonaut" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test index 21084fb8e..27ecd9d91 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test +++ b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test @@ -2,4 +2,4 @@ $ delete output > run $ exists output > publishLocal -$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-all-exclude-dependencies_2.11:0.1.0-SNAPSHOT +$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-all-exclude-dependencies_2.12:0.1.0-SNAPSHOT diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt index 21f304a4b..5948041f3 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt @@ -1,2 +1,2 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" libraryDependencies += "org.jclouds.api" % "nova" % "1.5.9" classifier "tests" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt index f0b2ed640..b2f9f7366 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" val checkEmpty = TaskKey[Unit]("checkEmpty") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/build.sbt index 7ffe593d5..14c04d3e6 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += "authenticated" at sys.env("TEST_REPOSITORY") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt index 4f809c617..cc22df788 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt @@ -1,6 +1,6 @@ import java.nio.file.Files -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += "authenticated" at sys.env("TEST_REPOSITORY") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt index 50fae1992..8036b14ae 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += "authenticated" at sys.env("TEST_REPOSITORY") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/build.sbt index 36d2ead16..f69b5e3e6 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += "authenticated" at sys.env("TEST_REPOSITORY") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt index 50fae1992..8036b14ae 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += "authenticated" at sys.env("TEST_REPOSITORY") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/build.sbt index f894add79..3781552ed 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += "authenticated" at sys.env("TEST_REPOSITORY") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt index 00f8aaec5..fab59da31 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += "authenticated" at sys.env("TEST_REPOSITORY") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/build.sbt index 627874b74..0ac1493d5 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/build.sbt @@ -1,11 +1,11 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" organization := "io.get-coursier.test" name := "sbt-coursier-exclude-dependencies" version := "0.1.0-SNAPSHOT" -libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.1" % "1.0.0-RC1" +libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M11" -excludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.11") +excludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.12") excludeDependencies += "io.argonaut" %% "argonaut" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/test b/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/test index ad685c023..fa5d6a196 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/test +++ b/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/test @@ -2,4 +2,4 @@ $ delete output > run $ exists output > publishLocal -$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-exclude-dependencies_2.11:0.1.0-SNAPSHOT +$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-exclude-dependencies_2.12:0.1.0-SNAPSHOT diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/build.sbt index 93f7aa347..8da3cb827 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/build.sbt @@ -2,7 +2,7 @@ lazy val a = project .settings(sharedSettings) .settings( - libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.234" from "https://oss.sonatype.org/content/repositories/releases/com/chuusai/shapeless_2.11/2.3.1/shapeless_2.11-2.3.1.jar" + libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.234" from "https://oss.sonatype.org/content/repositories/releases/com/chuusai/shapeless_2.12/2.3.3/shapeless_2.12-2.3.3.jar" ) lazy val b = project @@ -16,5 +16,5 @@ lazy val root = project lazy val sharedSettings = Seq( - scalaVersion := "2.11.8" + scalaVersion := "2.12.8" ) diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/from-no-head/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-no-head/build.sbt index bba414888..4b43164be 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/from-no-head/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/from-no-head/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" libraryDependencies += "ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided" from s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt index fbb442536..0a9adff9b 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt @@ -1,7 +1,7 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" // keeping the default cache policies here libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.2" from { - "https://repo1.maven.org/maven2/com/chuusai/shapeless_2.11/2.3.242/shapeless_2.11-2.3.242.jar" + "https://repo1.maven.org/maven2/com/chuusai/shapeless_2.12/2.3.242/shapeless_2.12-2.3.242.jar" } diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/from/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from/build.sbt index d400b6054..264bb782b 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/from/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/from/build.sbt @@ -1,11 +1,11 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.41" from { - val f = file("shapeless_2.11-2.3.0.jar") + val f = file("shapeless_2.12-2.3.3.jar") if (!f.exists()) { - val url0 = "https://repo1.maven.org/maven2/com/chuusai/shapeless_2.11/2.3.0/shapeless_2.11-2.3.0.jar" + val url0 = "https://repo1.maven.org/maven2/com/chuusai/shapeless_2.12/2.3.3/shapeless_2.12-2.3.3.jar" sLog.value.warn(s"Fetching $url0") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt index 983b4325e..ed962eef6 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" libraryDependencies += "org.apache.hadoop" % "hadoop-yarn-server-resourcemanager" % "2.7.1" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala index f2c112187..5d23b77b8 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala +++ b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala @@ -1,14 +1,9 @@ import java.io.File import java.nio.file.Files -import scalaz.stream._ -import scalaz.concurrent.Task - object Main extends App { - val pch = Process.constant((i:Int) => Task.now(())).take(3) - val count = Process.constant(1).toSource.to(pch).runLog.run.size - assert(count == 3) + // TODO Use some jvm-repr stuff as a test Files.write(new File("output").toPath, A.default.msg.getBytes("UTF-8")) } diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt index d375b4ab6..eaa38b9b5 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt @@ -2,7 +2,7 @@ lazy val a = project .settings(sharedSettings) .settings( - resolvers += "Scalaz Bintray Repo" at "https://dl.bintray.com/scalaz/releases" + resolvers += "Jitpack Repo" at "https://jitpack.io" ) lazy val b = project @@ -10,7 +10,7 @@ lazy val b = project .settings(sharedSettings) .settings( // resolver added in inter-project dependency only - should still be fine - libraryDependencies += "org.scalaz.stream" %% "scalaz-stream" % "0.7.1a" + libraryDependencies += "com.github.jupyter" % "jvm-repr" % "0.3.0" ) lazy val root = project @@ -20,5 +20,5 @@ lazy val root = project lazy val sharedSettings = Seq( - scalaVersion := "2.11.8" + scalaVersion := "2.12.8" ) diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project/build.sbt index ca35179d2..4d2efca47 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project/build.sbt @@ -1,15 +1,15 @@ lazy val sharedSettings = Seq( - scalaVersion := "2.11.8" + scalaVersion := "2.12.8" ) -/** Module with the same Maven coordinates as shapeless 2.3.1 */ +/** Module with the same Maven coordinates as shapeless 2.3.3 */ lazy val `shapeless-mock` = project .settings(sharedSettings) .settings( organization := "com.chuusai", name := "shapeless", - version := "2.3.1" + version := "2.3.3" ) lazy val a = project @@ -20,7 +20,7 @@ lazy val a = project version := "0.0.1" ) -/** Transitively depends on the - real - shapeless 2.3.1 */ +/** Transitively depends on the - real - shapeless 2.3.3 */ lazy val b = project .dependsOn(a) .settings(sharedSettings) @@ -28,5 +28,5 @@ lazy val b = project organization := "com.pany", name := "b", version := "0.0.1", - libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M1" + libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M11" ) diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt index baab5b347..6f6b423e6 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt @@ -1,8 +1,8 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += Resolver.url( - "webjars-bintray", - new URL("https://dl.bintray.com/scalaz/releases/") + "jitpack", + new URL("https://jitpack.io") )( // patterns should be ignored - and the repo be considered a maven one - because // isMavenCompatible is true @@ -15,4 +15,4 @@ resolvers += Resolver.url( ) ) -libraryDependencies += "org.scalaz.stream" %% "scalaz-stream" % "0.7.1" +libraryDependencies += "com.github.jupyter" % "jvm-repr" % "0.3.0" diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala index 3ebd25fca..eedd88b98 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala +++ b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala @@ -1,14 +1,9 @@ import java.io.File import java.nio.file.Files -import scalaz.stream._ -import scalaz.concurrent.Task - object Main extends App { - val pch = Process.constant((i:Int) => Task.now(())).take(3) - val count = Process.constant(1).toSource.to(pch).runLog.run.size - assert(count == 3) + // TODO Use some jvm-repr stuff Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) } diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt index 14d251c3e..a8b4cde61 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtCoursier -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.3") +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.25") diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt index 05705fe6c..bcdd10769 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt @@ -1,2 +1,2 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" credentials += Credentials(file("nope/nope/nope/nope/nope")) diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/profiles/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/profiles/build.sbt index becbd3496..4b7ec60fb 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/profiles/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/profiles/build.sbt @@ -1,5 +1,5 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" -libraryDependencies += "org.apache.spark" %% "spark-sql" % "1.6.2" +libraryDependencies += "org.apache.spark" %% "spark-sql" % "2.4.3" -mavenProfiles += "hadoop-2.6" +mavenProfiles += "hadoop-3.1" diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/profiles/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/profiles/src/main/scala/Main.scala index 9ac86fe34..b1ad346f1 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/profiles/src/main/scala/Main.scala +++ b/modules/sbt-coursier/src/sbt-test/shared-2/profiles/src/main/scala/Main.scala @@ -13,7 +13,7 @@ object Main extends App { val hadoopVersion = p.getProperty("version") Console.err.println(s"Found hadoop version $hadoopVersion") - assert(hadoopVersion == "2.6.0") + assert(hadoopVersion.startsWith("3.1.")) Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) } diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/build.sbt index 0a8f118b2..1fb518f79 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/build.sbt @@ -17,7 +17,7 @@ lazy val bar = project lazy val shared = Seq( organization := org, version := ver, - scalaVersion := "2.11.8", + scalaVersion := "2.12.8", confCheck := { val log = streams.value.log diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt index c03b2c8be..5642f168f 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt @@ -1 +1 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/build.sbt index 6c57785e5..97a9c838d 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" resolvers += Resolver.file("space-repo", file(raw"/tmp/space the final frontier/repo"))(Resolver.ivyStylePatterns) diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt index ebeefdbd8..ec6609a8e 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "2.11.8" +scalaVersion := "2.12.8" libraryDependencies += "org.apache.zookeeper" % "zookeeper" % "3.5.0-alpha" diff --git a/scripts/travis.sh b/scripts/travis.sh index 0efb3a565..b2f4bbd37 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -16,6 +16,8 @@ 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 @@ -32,6 +34,8 @@ runLmCoursierTests() { runSbtCoursierTests() { if [ "$TEST_GROUP" = 1 ]; then SCRIPTED_EXTRA="sbt-coursier/*" + elif [ "$TEST_GROUP" = 2 ]; then + SCRIPTED_EXTRA="scala-211/*" else SCRIPTED_EXTRA="" fi