luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3848 from eed3si9n/wip/jdk9 

Bump Scala versions for JDK 9 support
This commit is contained in:
eugene yokota 2018-01-04 05:07:51 -05:00 committed by GitHub
parent 160875e940 287f0a80a7
commit 68bc1634db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
project/Dependencies.scala
View File

@ -5,12 +5,12 @@ object Dependencies {
lazy val scala282 = "2.8.2"
lazy val scala292 = "2.9.2"
lazy val scala293 = "2.9.3"
lazy val scala210 = "2.10.6"
lazy val scala211 = "2.11.8"
lazy val scala212 = "2.12.0-RC2"
lazy val scala210 = "2.10.7"
lazy val scala211 = "2.11.12"
lazy val scala212 = "2.12.4"
lazy val jline = "jline" % "jline" % "2.14.4"
lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-48dd0744422128446aee9ac31aa356ee203cc9f4"
lazy val jline = "jline" % "jline" % "2.14.5"
lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-b18f59ea3bc914a297bb6f1a4f7fb0ace399e310"
lazy val jsch = "com.jcraft" % "jsch" % "0.1.50" intransitive ()
lazy val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"
lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.2"

2
sbt/src/sbt-test/actions/doc-file-options/build.sbt
View File

@ -2,7 +2,7 @@ val newContents = "bbbbbbbbb"
val rootContentFile = "root.txt"
scalaVersion := "2.10.2"
scalaVersion := "2.10.7"
scalacOptions in (Compile, doc) := Seq("-doc-root-content", rootContentFile)

4
sbt/src/sbt-test/actions/doc-scala-instance/build.sbt
View File

@ -1,10 +1,10 @@
lazy val a = project.settings(
scalaVersion := "2.9.2",
scalaVersion := "2.11.12",
scalaInstance in (Compile,doc) := (scalaInstance in b).value,
// 2.10.1-only, so this will only succeed if `doc` recognizes the more specific scalaInstance scoped to `doc`
scalacOptions in (Compile,doc) += "-implicits"
)
lazy val b = project.settings(
scalaVersion := "2.10.1"
scalaVersion := "2.10.7"
)

2
sbt/src/sbt-test/actions/generator/build.sbt
View File

@ -2,7 +2,7 @@ lazy val buildInfo = taskKey[Seq[File]]("The task that generates the build info.
lazy val root = (project in file("."))
.settings(
scalaVersion := "2.11.8",
scalaVersion := "2.11.12",
buildInfo := {
val x = sourceManaged.value / "BuildInfo.scala"
IO.write(x, """object BuildInfo""")

2
sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt
View File

@ -1,5 +1,5 @@
lazy val root = (project in file(".")).
settings(
incOptions := sbt.inc.IncOptions.Default,
scalaVersion := "2.11.7"
scalaVersion := "2.11.12"
)

4
sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt
View File

@ -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(

5
sbt/src/sbt-test/dependency-management/cache-update/build.sbt
View File

@ -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

5
sbt/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt
View File

@ -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.

5
sbt/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt
View File

@ -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.

17
sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt
View File

@ -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)
}

5
sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt
View File

@ -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[_]] =

5
sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt
View File

@ -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[_]] =

5
sbt/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt
View File

@ -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[_]] =

5
sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt
View File

@ -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.

5
sbt/src/sbt-test/dependency-management/circular-dependency/multi.sbt
View File

@ -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.

4
sbt/src/sbt-test/dependency-management/conflict-manager-with-org/build.sbt
View File

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

2
sbt/src/sbt-test/dependency-management/mvn-local/build.sbt
View File

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

2
sbt/src/sbt-test/source-dependencies/naha-synthetic/build.sbt
View File

@ -1,5 +1,5 @@
lazy val root = (project in file(".")).
settings(
scalaVersion := "2.11.7",
scalaVersion := "2.11.12",
incOptions := incOptions.value.withIncludeSynthToNameHashing(true)
)