bump Scala 2.11 to 2.11.12 because we use JDK 11

2019-04-22 10:54:39 -04:00 · 2019-04-22 10:54:39 -04:00 · 258a8930a5
parent 24db77edc5
commit 258a8930a5
20 changed files with 21 additions and 54 deletions
--- a/sbt/src/sbt-test/dependency-management/aar-packaging/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/aar-packaging/build.sbt
@ -1,4 +1,4 @@
-scalaVersion := "2.11.8"
+ThisBuild / scalaVersion := "2.11.12"

 libraryDependencies += ("com.rengwuxian.materialedittext" % "library" % "2.1.4")
  .exclude("com.android.support", "support-v4")
--- a/sbt/src/sbt-test/dependency-management/chainresolver/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/chainresolver/build.sbt
@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("Runs the check")
 def commonSettings: Seq[Def.Setting[_]] =
  Seq(
    ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")),
-    scalaVersion in ThisBuild := "2.11.7",
+    scalaVersion in ThisBuild := "2.11.12",
    organization in ThisBuild := "com.example",
    version in ThisBuild := "0.1.0-SNAPSHOT",
    autoScalaLibrary := false,
--- a/sbt/src/sbt-test/dependency-management/classifier2/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/classifier2/build.sbt
@ -1,2 +1,2 @@
-scalaVersion := "2.11.8"
+ThisBuild / scalaVersion := "2.11.12"
 libraryDependencies += "org.jclouds.api" % "nova" % "1.5.9" classifier "tests"
--- a/sbt/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt
@ -1,9 +1,9 @@
-ThisBuild / scalaVersion := "2.12.6"
+ThisBuild / scalaVersion := "2.12.8"

 lazy val check = taskKey[Unit]("")

 // We can't use "%%" here without breaking the "== bridgeModule" check below
-val bridgeModule = "org.scala-sbt" % s"compiler-bridge_2.12" % "1.2.1"
+val bridgeModule = "org.scala-sbt" % s"compiler-bridge_2.12" % "1.3.0-M3"

 libraryDependencies += bridgeModule % Configurations.ScalaTool

--- a/sbt/src/sbt-test/dependency-management/exclude-dependencies/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/exclude-dependencies/build.sbt
@ -9,14 +9,14 @@ val repatchTwitter = "com.eed3si9n" %% "repatch-twitter-core" % "dispatch0.11.1_

 lazy val a = (project in file("a")).
  settings(
-    scalaVersion := "2.11.4",
+    scalaVersion := "2.11.12",
    libraryDependencies += dispatch,
    excludeDependencies += "org.slf4j"
  )

 lazy val b = (project in file("b")).
  settings(
-    scalaVersion := "2.11.4",
+    scalaVersion := "2.11.12",
    libraryDependencies += repatchTwitter,
    excludeDependencies += "net.databinder.dispatch" %% "dispatch-core"
  )
--- a/sbt/src/sbt-test/dependency-management/exclude-dependencies2/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/exclude-dependencies2/build.sbt
@ -1,5 +1,5 @@

-scalaVersion := "2.11.8"
+ThisBuild / scalaVersion := "2.11.12"

 organization := "io.get-coursier.test"
 name := "sbt-coursier-exclude-dependencies"
--- a/sbt/src/sbt-test/dependency-management/fallback-dependencies-inter-project/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/fallback-dependencies-inter-project/build.sbt
@ -1,20 +1,13 @@
+ThisBuild / scalaVersion := "2.11.12"

 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"
  )

 lazy val b = project
  .dependsOn(a)
-  .settings(sharedSettings)

 lazy val root = project
  .in(file("."))
  .aggregate(a, b)
-  .settings(sharedSettings)
-
-
-lazy val sharedSettings = Seq(
-  scalaVersion := "2.11.8"
-)
--- a/sbt/src/sbt-test/dependency-management/hadoop-yarn-server-resourcemanager/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/hadoop-yarn-server-resourcemanager/build.sbt
@ -1,3 +1,3 @@
-scalaVersion := "2.11.8"
+ThisBuild / scalaVersion := "2.11.12"

 libraryDependencies += "org.apache.hadoop" % "hadoop-yarn-server-resourcemanager" % "2.7.1"
--- a/sbt/src/sbt-test/dependency-management/inter-project-resolvers/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/inter-project-resolvers/build.sbt
@ -1,13 +1,12 @@
+ThisBuild / scalaVersion := "2.11.12"

 lazy val a = project
-  .settings(sharedSettings)
  .settings(
    resolvers += "Scalaz Bintray Repo" at "https://dl.bintray.com/scalaz/releases"
  )

 lazy val b = project
  .dependsOn(a)
-  .settings(sharedSettings)
  .settings(
    // resolver added in inter-project dependency only - should still be fine
    libraryDependencies += "org.scalaz.stream" %% "scalaz-stream" % "0.7.1a"
@ -16,9 +15,3 @@ lazy val b = project
 lazy val root = project
  .in(file("."))
  .aggregate(a, b)
-  .settings(sharedSettings)
-
-
-lazy val sharedSettings = Seq(
-  scalaVersion := "2.11.8"
-)
--- a/sbt/src/sbt-test/dependency-management/inter-project/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/inter-project/build.sbt
@ -1,11 +1,7 @@
-
-lazy val sharedSettings = Seq(
-  scalaVersion := "2.11.8"
-)
+ThisBuild / scalaVersion := "2.11.12"

 /** Module with the same Maven coordinates as shapeless 2.3.1 */
 lazy val `shapeless-mock` = project
-  .settings(sharedSettings)
  .settings(
    organization := "com.chuusai",
    name := "shapeless",
@ -13,7 +9,6 @@ lazy val `shapeless-mock` = project
  )

 lazy val a = project
-  .settings(sharedSettings)
  .settings(
    organization := "com.pany",
    name := "a",
@ -23,7 +18,6 @@ lazy val a = project
 /** Transitively depends on the - real - shapeless 2.3.1 */
 lazy val b = project
  .dependsOn(a)
-  .settings(sharedSettings)
  .settings(
    organization := "com.pany",
    name := "b",
--- a/sbt/src/sbt-test/dependency-management/profiles/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/profiles/build.sbt
@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.11.8"
+ThisBuild / scalaVersion := "2.11.12"

 Compile / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
 libraryDependencies += "org.apache.spark" %% "spark-sql" % "1.6.2"
--- a/sbt/src/sbt-test/dependency-management/scala-organization-version-check/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/scala-organization-version-check/build.sbt
@ -2,7 +2,7 @@ scalaOrganization := "org.other"

 scalaArtifacts += "thing"

-scalaVersion := "2.11.8"
+ThisBuild / scalaVersion := "2.11.12"

 libraryDependencies ++= Seq(
  "org.other" % "thing" % "1.2.3",
--- a/sbt/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt
@ -1,6 +1,6 @@
 // https://github.com/sbt/sbt/issues/1818

-scalaVersion := "2.11.5"
+ThisBuild / scalaVersion := "2.11.12"
 libraryDependencies += "org.scala-lang" %% "scala-actors-migration" % "1.1.0"
 libraryDependencies += "org.scala-lang" %% "scala-pickling" % "0.9.1"

--- a/sbt/src/sbt-test/dependency-management/transitive-version-range/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/transitive-version-range/build.sbt
@ -1,5 +1,6 @@
+ThisBuild / scalaVersion := "2.11.12"
+
 organization := "com.test"
 name := "maven-version-range-bug"
 version := "1.0.0-SNAPSHOT"
-scalaVersion := "2.11.6"
-libraryDependencies += "com.amazonaws" % "aws-java-sdk" % "1.7.8.1"
+libraryDependencies += "com.amazonaws" % "aws-java-sdk" % "1.7.8.1"
--- a/sbt/src/sbt-test/dependency-management/typelevel/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/typelevel/build.sbt
@ -1,3 +0,0 @@
-scalaOrganization := "org.typelevel"
-scalaVersion := "2.11.7"
-scalacOptions += "-Xexperimental"
--- a/sbt/src/sbt-test/dependency-management/typelevel/src/main/scala/Main.scala
+++ b/sbt/src/sbt-test/dependency-management/typelevel/src/main/scala/Main.scala
@ -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"))
-}
--- a/sbt/src/sbt-test/dependency-management/typelevel/test
+++ b/sbt/src/sbt-test/dependency-management/typelevel/test
@ -1,3 +0,0 @@
-$ delete output
-> run
-$ exists output
--- a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt
@ -1,4 +1,4 @@
-scalaVersion := "2.11.11"
+ThisBuild / scalaVersion := "2.11.12"

 ivyConfiguration := {
  throw new RuntimeException("updateSbtClassifiers should use updateSbtClassifiers / ivyConfiguration")
--- a/sbt/src/sbt-test/dependency-management/url-no-head/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/url-no-head/build.sbt
@ -1,3 +1,3 @@
-scalaVersion := "2.11.8"
+ThisBuild / scalaVersion := "2.11.12"

 libraryDependencies += "ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided" from s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar"
--- a/sbt/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt
+++ b/sbt/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt
@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20")