From 287f0a80a799bc3b3ffadc65a51403532a7f5825 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 2 Jan 2018 20:43:21 -0500 Subject: [PATCH] Update more Scala versions in scripted test --- .../error-in-invalidated/build.sbt | 2 +- .../separate-analysis-per-scala/build.sbt | 4 ++-- .../cache-update/build.sbt | 5 +++-- .../changes/multi.sbt | 5 +++-- .../cached-resolution-circular/multi.sbt | 5 +++-- .../cached-resolution-classifier/multi.sbt | 17 +++++++++-------- .../cached-resolution-conflicts/multi.sbt | 5 +++-- .../cached-resolution-exclude/multi.sbt | 5 +++-- .../cached-resolution-force/multi.sbt | 5 +++-- .../circular-dependency/changes/multi.sbt | 5 +++-- .../circular-dependency/multi.sbt | 5 +++-- .../conflict-manager-with-org/build.sbt | 4 ++-- .../dependency-management/mvn-local/build.sbt | 2 +- .../naha-synthetic/build.sbt | 2 +- 14 files changed, 40 insertions(+), 31 deletions(-) diff --git a/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt b/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt index 8a40ded0c..3370e3d75 100644 --- a/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt +++ b/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt @@ -1,5 +1,5 @@ lazy val root = (project in file(".")). settings( incOptions := sbt.inc.IncOptions.Default, - scalaVersion := "2.11.7" + scalaVersion := "2.11.12" ) diff --git a/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt b/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt index 090b41544..0b846387e 100644 --- a/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt +++ b/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt @@ -1,8 +1,8 @@ name := "foo" -scalaVersion := "2.10.4" +scalaVersion := "2.10.7" -crossScalaVersions := List("2.10.4", "2.11.0") +crossScalaVersions := List("2.10.7", "2.11.0") incOptions := incOptions.value.withNewClassfileManager( sbt.inc.ClassfileManager.transactional( diff --git a/sbt/src/sbt-test/dependency-management/cache-update/build.sbt b/sbt/src/sbt-test/dependency-management/cache-update/build.sbt index 92e439733..e74f99c2e 100644 --- a/sbt/src/sbt-test/dependency-management/cache-update/build.sbt +++ b/sbt/src/sbt-test/dependency-management/cache-update/build.sbt @@ -3,8 +3,9 @@ lazy val check = taskKey[Unit]("Runs the check") def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), - scalaVersion := "2.10.4", - resolvers += Resolver.sonatypeRepo("snapshots") + scalaVersion := "2.10.7", + resolvers += Resolver.sonatypeRepo("snapshots"), + resolvers += Resolver.sonatypeRepo("staging") ) // #1620 diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt index b802f3e21..96d22a371 100644 --- a/sbt/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt @@ -9,9 +9,10 @@ val akkaVersion = "2.3.1" def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")), - scalaVersion := "2.10.4", + scalaVersion := "2.10.7", fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), - updateOptions := updateOptions.value.withCachedResolution(true) + updateOptions := updateOptions.value.withCachedResolution(true), + resolvers += Resolver.sonatypeRepo("staging") ) lazy val a = project. diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt index 8ba4c7f15..6714565e9 100644 --- a/sbt/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt @@ -9,9 +9,10 @@ val akkaVersion = "2.3.1" def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")), - scalaVersion := "2.10.4", + scalaVersion := "2.10.7", fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), - updateOptions := updateOptions.value.withCachedResolution(true) + updateOptions := updateOptions.value.withCachedResolution(true), + resolvers += Resolver.sonatypeRepo("staging") ) lazy val a = project. diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt index fc62f5603..c216c072f 100644 --- a/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt @@ -4,8 +4,9 @@ def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", - scalaVersion := "2.10.4", - resolvers += Resolver.sonatypeRepo("snapshots") + scalaVersion := "2.10.7", + resolvers += Resolver.sonatypeRepo("snapshots"), + resolvers += Resolver.sonatypeRepo("staging") ) lazy val classifierTest = project. @@ -63,9 +64,9 @@ lazy val root = (project in file(".")). organization in ThisBuild := "org.example", version in ThisBuild := "1.0", check := { - val acp = (externalDependencyClasspath in Compile in a).value.map {_.data.getName}.sorted - val bcp = (externalDependencyClasspath in Compile in b).value.map {_.data.getName}.sorted - val ccp = (externalDependencyClasspath in Compile in c).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} + val acp = (externalDependencyClasspath in Compile in a).value.map {_.data.getName}.sorted filterNot { _ startsWith "scala-library" } + val bcp = (externalDependencyClasspath in Compile in b).value.map {_.data.getName}.sorted filterNot { _ startsWith "scala-library" } + val ccp = (externalDependencyClasspath in Compile in c).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} filterNot { _ startsWith "scala-library" } if (!(acp contains "commons-io-1.4-sources.jar")) { sys.error("commons-io-1.4-sources not found when it should be included: " + acp.toString) } @@ -83,9 +84,9 @@ lazy val root = (project in file(".")). "\n - b (plain) " + bcpWithoutSource.toString + "\n - c (inter-project) " + ccpWithoutSource.toString) - val atestcp = (externalDependencyClasspath in Test in a).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} - val btestcp = (externalDependencyClasspath in Test in b).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} - val ctestcp = (externalDependencyClasspath in Test in c).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} filterNot { _ == "commons-io-1.4.jar"} + val atestcp = (externalDependencyClasspath in Test in a).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} filterNot { _ startsWith "scala-library" } + val btestcp = (externalDependencyClasspath in Test in b).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} filterNot { _ startsWith "scala-library" } + val ctestcp = (externalDependencyClasspath in Test in c).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} filterNot { _ == "commons-io-1.4.jar"} filterNot { _ startsWith "scala-library" } if (ctestcp contains "junit-4.11.jar") { sys.error("junit found when it should be excluded: " + ctestcp.toString) } diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt index abdb4dc68..0aa74770e 100644 --- a/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt @@ -8,8 +8,9 @@ def commonSettings: Seq[Def.Setting[_]] = version := "0.1.0", ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", - scalaVersion := "2.10.4", - fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project") + scalaVersion := "2.10.7", + fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), + resolvers += Resolver.sonatypeRepo("staging") ) def cachedResolutionSettings: Seq[Def.Setting[_]] = diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt index c9233cc5a..daf078f0e 100644 --- a/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt @@ -5,8 +5,9 @@ def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", - scalaVersion := "2.10.4", - resolvers += Resolver.sonatypeRepo("snapshots") + scalaVersion := "2.10.7", + resolvers += Resolver.sonatypeRepo("snapshots"), + resolvers += Resolver.sonatypeRepo("staging") ) def cachedResolutionSettings: Seq[Def.Setting[_]] = diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt index 380e0cc65..8461a6d24 100644 --- a/sbt/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt @@ -4,8 +4,9 @@ def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", - scalaVersion := "2.10.4", - resolvers += Resolver.sonatypeRepo("snapshots") + scalaVersion := "2.10.7", + resolvers += Resolver.sonatypeRepo("snapshots"), + resolvers += Resolver.sonatypeRepo("staging") ) def cachedResolutionSettings: Seq[Def.Setting[_]] = diff --git a/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt b/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt index 68ccf8107..6f50da7c1 100644 --- a/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt @@ -3,9 +3,10 @@ lazy val check = taskKey[Unit]("Runs the check") def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")), - scalaVersion := "2.10.4", + scalaVersion := "2.10.7", fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), - updateOptions := updateOptions.value.withCircularDependencyLevel(CircularDependencyLevel.Error) + updateOptions := updateOptions.value.withCircularDependencyLevel(CircularDependencyLevel.Error), + resolvers += Resolver.sonatypeRepo("staging") ) lazy val a = project. diff --git a/sbt/src/sbt-test/dependency-management/circular-dependency/multi.sbt b/sbt/src/sbt-test/dependency-management/circular-dependency/multi.sbt index 0a6454d57..4a1b567a3 100644 --- a/sbt/src/sbt-test/dependency-management/circular-dependency/multi.sbt +++ b/sbt/src/sbt-test/dependency-management/circular-dependency/multi.sbt @@ -3,8 +3,9 @@ lazy val check = taskKey[Unit]("Runs the check") def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")), - scalaVersion := "2.10.4", - fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project") + scalaVersion := "2.10.7", + fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), + resolvers += Resolver.sonatypeRepo("staging") ) lazy val a = project. diff --git a/sbt/src/sbt-test/dependency-management/conflict-manager-with-org/build.sbt b/sbt/src/sbt-test/dependency-management/conflict-manager-with-org/build.sbt index 01013eaa4..b801f1639 100644 --- a/sbt/src/sbt-test/dependency-management/conflict-manager-with-org/build.sbt +++ b/sbt/src/sbt-test/dependency-management/conflict-manager-with-org/build.sbt @@ -1,5 +1,5 @@ -scalaVersion := "2.10.4" - +scalaVersion := "2.10.7" +resolvers += Resolver.sonatypeRepo("staging") conflictManager := ConflictManager.strict.copy(organization = "^(?!org\\.scala-lang).*$") libraryDependencies += "org.specs2" %% "specs2" % "2.3.10-scalaz-7.1.0-M6" % "test" diff --git a/sbt/src/sbt-test/dependency-management/mvn-local/build.sbt b/sbt/src/sbt-test/dependency-management/mvn-local/build.sbt index 10b0d8003..e32558bac 100644 --- a/sbt/src/sbt-test/dependency-management/mvn-local/build.sbt +++ b/sbt/src/sbt-test/dependency-management/mvn-local/build.sbt @@ -2,7 +2,7 @@ def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", - scalaVersion := "2.10.4", + scalaVersion := "2.10.7", organization in ThisBuild := "org.example", version in ThisBuild := "1.0-SNAPSHOT" ) diff --git a/sbt/src/sbt-test/source-dependencies/naha-synthetic/build.sbt b/sbt/src/sbt-test/source-dependencies/naha-synthetic/build.sbt index cd5970b1c..8b921138c 100644 --- a/sbt/src/sbt-test/source-dependencies/naha-synthetic/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/naha-synthetic/build.sbt @@ -1,5 +1,5 @@ lazy val root = (project in file(".")). settings( - scalaVersion := "2.11.7", + scalaVersion := "2.11.12", incOptions := incOptions.value.withIncludeSynthToNameHashing(true) )