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

Update more Scala versions in scripted test

This commit is contained in:
Eugene Yokota 2018-01-02 20:43:21 -05:00
parent d8a71c5d34
commit 287f0a80a7
14 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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