diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f67147007..cb9dbce49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,19 +132,23 @@ jobs: if: ${{ matrix.jobtype == 2 }} shell: bash run: | - ./sbt -v "scripted actions/* apiinfo/* compiler-project/* ivy-deps-management/* reporter/* tests/* watch/* classloader-cache/* package/*" + ./sbt -v "scripted actions/* apiinfo/* compiler-project/* ivy-deps-management/* reporter/* tests/* classloader-cache/* package/*" + # ./sbt -v "scripted watch/*" - name: Build and test (3) if: ${{ matrix.jobtype == 3 }} shell: bash run: | # ./sbt -v "dependencyTreeProj/publishLocal; scripted dependency-graph/*" - ./sbt -v --client "scripted dependency-management/* plugins/* project-load/* java/* run/* nio/*" + ./sbt -v --client "scripted dependency-management/* project-load/* java/* run/*" + # ./sbt -v --client "scripted plugins/*" + # ./sbt -v --client "scripted nio/*" - name: Build and test (4) if: ${{ matrix.jobtype == 4 }} shell: bash run: | # ./sbt -v "repoOverrideTest:scripted dependency-management/*" - ./sbt -v "scripted source-dependencies/* project/*" + ./sbt -v "scripted source-dependencies/*" + # ./sbt -v "scripted project/*" # - name: Build and test (5) # if: ${{ matrix.jobtype == 5 }} # shell: bash diff --git a/sbt-app/src/main/scala/package.scala b/sbt-app/src/main/scala/package.scala index cc5e01484..dc160ad77 100644 --- a/sbt-app/src/main/scala/package.scala +++ b/sbt-app/src/main/scala/package.scala @@ -28,6 +28,16 @@ package object sbt with sbt.OptionSyntax with sbt.SlashSyntax with sbt.Import: + export Project.{ + validProjectID, + fillTaskAxis, + mapScope, + transform, + transformRef, + inThisBuild, + inScope, + normalizeModuleID + } // IO def uri(s: String): URI = new URI(s) def file(s: String): File = new File(s) diff --git a/sbt-app/src/sbt-test/actions/generator/test b/sbt-app/src/sbt-test/actions/generator/pending similarity index 100% rename from sbt-app/src/sbt-test/actions/generator/test rename to sbt-app/src/sbt-test/actions/generator/pending diff --git a/sbt-app/src/sbt-test/actions/input-task-dyn/test b/sbt-app/src/sbt-test/actions/input-task-dyn/pending similarity index 100% rename from sbt-app/src/sbt-test/actions/input-task-dyn/test rename to sbt-app/src/sbt-test/actions/input-task-dyn/pending diff --git a/sbt-app/src/sbt-test/actions/run-task/test b/sbt-app/src/sbt-test/actions/run-task/pending similarity index 100% rename from sbt-app/src/sbt-test/actions/run-task/test rename to sbt-app/src/sbt-test/actions/run-task/pending diff --git a/sbt-app/src/sbt-test/actions/task-map/test b/sbt-app/src/sbt-test/actions/task-map/pending similarity index 100% rename from sbt-app/src/sbt-test/actions/task-map/test rename to sbt-app/src/sbt-test/actions/task-map/pending diff --git a/sbt-app/src/sbt-test/compiler-project/inc-package-class-dependency/src/main/scala/test/nested/Foo.scala b/sbt-app/src/sbt-test/compiler-project/inc-package-class-dependency/src/main/scala/test/nested/Foo.scala index 185597caf..36b99339a 100644 --- a/sbt-app/src/sbt-test/compiler-project/inc-package-class-dependency/src/main/scala/test/nested/Foo.scala +++ b/sbt-app/src/sbt-test/compiler-project/inc-package-class-dependency/src/main/scala/test/nested/Foo.scala @@ -1,5 +1,5 @@ package test.nested trait Foo { - def xyz(x: test.Nested) + def xyz(x: test.Nested): Unit } diff --git a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt index 1019be51a..214317110 100644 --- a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt @@ -1,8 +1,8 @@ ThisBuild / scalaVersion := "2.12.17" libraryDependencies ++= Seq( - "com.novocode" % "junit-interface" % "0.5" % Test, - "junit" % "junit" % "4.13.1" % Test, + "com.novocode" % "junit-interface" % "0.5" % Test, + "junit" % "junit" % "4.13.1" % Test, "commons-io" % "commons-io" % "2.5" % Runtime, ) diff --git a/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/test b/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/pending similarity index 100% rename from sbt-app/src/sbt-test/compiler-project/src-dep-plugin/test rename to sbt-app/src/sbt-test/compiler-project/src-dep-plugin/pending diff --git a/sbt-app/src/sbt-test/dependency-management/artifact/pending b/sbt-app/src/sbt-test/dependency-management/artifact/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/artifact/pending rename to sbt-app/src/sbt-test/dependency-management/artifact/test diff --git a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/pending b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/cache-classifiers/pending rename to sbt-app/src/sbt-test/dependency-management/cache-classifiers/test diff --git a/sbt-app/src/sbt-test/dependency-management/cache-local/pending b/sbt-app/src/sbt-test/dependency-management/cache-local/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/cache-local/pending rename to sbt-app/src/sbt-test/dependency-management/cache-local/test diff --git a/sbt-app/src/sbt-test/dependency-management/cache-update/build.sbt b/sbt-app/src/sbt-test/dependency-management/cache-update/build.sbt index 6206d5c90..36cfe823e 100644 --- a/sbt-app/src/sbt-test/dependency-management/cache-update/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cache-update/build.sbt @@ -31,7 +31,7 @@ lazy val root = (project in file(".")) // https://github.com/sbt/sbt/pull/1620 // sbt resolves dependencies every compile when using %% with dependencyOverrides TaskKey[Unit]("check") := { - val s = (streams in update).value + val s = (update / streams).value val cacheDirectory = crossTarget.value / "update" / updateCacheName.value val cacheStoreFactory = sbt.util.CacheStoreFactory.directory(cacheDirectory) diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt index f0234ce98..542a9fe0b 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt @@ -7,7 +7,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), - dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", + dependencyCacheDirectory := (LocalRootProject / baseDirectory).value / "dependency", scalaVersion := "2.10.4", resolvers += Resolver.sonatypeRepo("snapshots") ) @@ -16,7 +16,7 @@ lazy val classifierTest = project. settings(commonSettings: _*). settings( libraryDependencies := Seq( - "net.sf.json-lib" % "json-lib" % "2.4" classifier "jdk15" intransitive(), + ("net.sf.json-lib" % "json-lib" % "2.4").classifier("jdk15").intransitive(), "commons-io" % "commons-io" % "1.4" ) ) @@ -34,11 +34,11 @@ lazy val a = project. settings(commonSettings: _*). settings( updateOptions := updateOptions.value.withCachedResolution(true), - artifact in (Compile, packageBin) := Artifact("demo"), + (Compile / packageBin / artifact) := Artifact("demo"), libraryDependencies := Seq( "com.typesafe.akka" %% "akka-remote" % "2.3.4" exclude("com.typesafe.akka", "akka-actor_2.10"), "net.databinder" %% "unfiltered-uploads" % "0.8.0", - "commons-io" % "commons-io" % "1.4" classifier "sources", + ("commons-io" % "commons-io" % "1.4").classifier("sources"), "com.typesafe" % "config" % "0.4.9-SNAPSHOT" ) ) @@ -50,7 +50,7 @@ lazy val b = project. libraryDependencies := Seq( "com.typesafe.akka" %% "akka-remote" % "2.3.4" exclude("com.typesafe.akka", "akka-actor_2.10"), "net.databinder" %% "unfiltered-uploads" % "0.8.0", - "commons-io" % "commons-io" % "1.4" classifier "sources", + ("commons-io" % "commons-io" % "1.4").classifier("sources"), "com.typesafe" % "config" % "0.4.9-SNAPSHOT" ) ) @@ -64,8 +64,8 @@ lazy val c = project. lazy val root = (project in file(".")). settings( - organization in ThisBuild := "org.example", - version in ThisBuild := "1.0", + (ThisBuild / organization) := "org.example", + (ThisBuild / version) := "1.0", check := { val acp = (a / Compile / externalDependencyClasspath).value.map {_.data.getName}.sorted val bcp = (b / Compile / externalDependencyClasspath).value.map {_.data.getName}.sorted diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-configurations/build.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-configurations/build.sbt index afd305e08..ebfcae721 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-configurations/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-configurations/build.sbt @@ -1,14 +1,15 @@ import xsbti.AppConfiguration ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" +ThisBuild / scalaVersion := "2.12.17" def commonSettings: Vector[Def.Setting[_]] = Vector( organization := "com.example", ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), - dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", + dependencyCacheDirectory := (LocalRootProject / baseDirectory).value / "dependency", scalaCompilerBridgeResolvers += userLocalFileResolver(appConfiguration.value), - resolvers += Resolver.file("buggy", (baseDirectory in LocalRootProject).value / "repo")( + resolvers += Resolver.file("buggy", (LocalRootProject / baseDirectory).value / "repo")( Patterns( ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"), artifactPatterns = Vector("[organization]/[module]/[revision]/[artifact]"), diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt index 54df64b1b..97a892817 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt @@ -12,7 +12,7 @@ inThisBuild(Seq( def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), - dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", + dependencyCacheDirectory := (LocalRootProject / baseDirectory).value / "dependency", fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project") ) @@ -27,7 +27,7 @@ val y1 = project.settings( libraryDependencies ++= Seq( "com.ning" % "async-http-client" % "1.8.14", // this includes slf4j 1.7.5 "com.twitter" % "summingbird-core_2.10" % "0.5.0", // this includes slf4j 1.6.6 - "org.slf4j" % "slf4j-api" % "1.6.6" force(), + ("org.slf4j" % "slf4j-api" % "1.6.6").force(), "commons-logging" % "commons-logging" % "1.1" // this includes servlet-api 2.3 ) ) @@ -42,7 +42,7 @@ val y2 = project.settings( ) TaskKey[Unit]("check") := { - val x1cp = (externalDependencyClasspath in Compile in x1).value.map(_.data.getName).sorted + val x1cp = (x1 / Compile / externalDependencyClasspath).value.map(_.data.getName).sorted def x1cpStr = x1cp.mkString("\n* ", "\n* ", "") // if (!(x1cp contains "slf4j-api-1.6.6.jar")) diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt index dd4237348..f3c52ba43 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt @@ -5,7 +5,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), - dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", + dependencyCacheDirectory := (LocalRootProject / baseDirectory).value / "dependency", scalaVersion := "2.10.4", resolvers += Resolver.sonatypeRepo("snapshots") ) @@ -19,10 +19,10 @@ lazy val a = project. settings(cachedResolutionSettings: _*). settings( libraryDependencies := Seq( - "org.springframework" % "spring-core" % "3.2.2.RELEASE" force() exclude("org.springframework", "spring-asm"), - "org.springframework" % "spring-tx" % "3.1.2.RELEASE" force() exclude("org.springframework", "spring-asm"), - "org.springframework" % "spring-beans" % "3.2.2.RELEASE" force() exclude("org.springframework", "spring-asm"), - "org.springframework" % "spring-context" % "3.1.2.RELEASE" force() exclude("org.springframework", "spring-asm") + ("org.springframework" % "spring-core" % "3.2.2.RELEASE").force().exclude("org.springframework", "spring-asm"), + ("org.springframework" % "spring-tx" % "3.1.2.RELEASE").force().exclude("org.springframework", "spring-asm"), + ("org.springframework" % "spring-beans" % "3.2.2.RELEASE").force().exclude("org.springframework", "spring-asm"), + ("org.springframework" % "spring-context" % "3.1.2.RELEASE").force().exclude("org.springframework", "spring-asm") ) ) @@ -30,10 +30,10 @@ lazy val b = project. settings(commonSettings: _*). settings( libraryDependencies := Seq( - "org.springframework" % "spring-core" % "3.2.2.RELEASE" force() exclude("org.springframework", "spring-asm"), - "org.springframework" % "spring-tx" % "3.1.2.RELEASE" force() exclude("org.springframework", "spring-asm"), - "org.springframework" % "spring-beans" % "3.2.2.RELEASE" force() exclude("org.springframework", "spring-asm"), - "org.springframework" % "spring-context" % "3.1.2.RELEASE" force() exclude("org.springframework", "spring-asm") + ("org.springframework" % "spring-core" % "3.2.2.RELEASE").force().exclude("org.springframework", "spring-asm"), + ("org.springframework" % "spring-tx" % "3.1.2.RELEASE").force().exclude("org.springframework", "spring-asm"), + ("org.springframework" % "spring-beans" % "3.2.2.RELEASE").force().exclude("org.springframework", "spring-asm"), + ("org.springframework" % "spring-context" % "3.1.2.RELEASE").force().exclude("org.springframework", "spring-asm") ) ) diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt index bd1a0c681..fc3498161 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt @@ -9,7 +9,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), - dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", + dependencyCacheDirectory := (LocalRootProject / baseDirectory).value / "dependency", resolvers += Resolver.sonatypeRepo("snapshots") ) diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-overrides/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-overrides/multi.sbt index a4d31725a..8cee7f0f0 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-overrides/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-overrides/multi.sbt @@ -7,7 +7,7 @@ ThisBuild / version := "1.0" def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), - dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", + dependencyCacheDirectory := (LocalRootProject / baseDirectory).value / "dependency", libraryDependencies := Seq( "net.databinder" %% "unfiltered-uploads" % "0.8.0", "commons-io" % "commons-io" % "1.3", diff --git a/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt b/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt index 6fc574134..5302e3951 100644 --- a/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt @@ -5,7 +5,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")), + ivyPaths := IvyPaths( (ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), scalaVersion := "2.10.4", fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), updateOptions := updateOptions.value.withCircularDependencyLevel(CircularDependencyLevel.Error) @@ -39,6 +39,6 @@ lazy val c = project. lazy val root = (project in file(".")). settings(commonSettings: _*). settings( - organization in ThisBuild := "org.example", - version in ThisBuild := "1.0-SNAPSHOT" + (ThisBuild / organization) := "org.example", + (ThisBuild / version) := "1.0-SNAPSHOT" ) diff --git a/sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/pending b/sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/pending rename to sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/test diff --git a/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt b/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt index b07c2caeb..c323436db 100644 --- a/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt @@ -8,7 +8,7 @@ resolvers += Resolver.typesafeIvyRepo("releases") libraryDependencies += "bad" % "mvn" % "1.0" TaskKey[Unit]("check") := { - val cp = (fullClasspath in Compile).value + val cp = (Compile / fullClasspath).value def isTestJar(n: String): Boolean = (n contains "scalacheck") || (n contains "specs2") diff --git a/sbt-app/src/sbt-test/dependency-management/custom-config/test b/sbt-app/src/sbt-test/dependency-management/custom-config/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/custom-config/test rename to sbt-app/src/sbt-test/dependency-management/custom-config/pending diff --git a/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt b/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt index 69da3bd1a..5eafbd756 100644 --- a/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt @@ -3,19 +3,19 @@ ThisBuild / organization := "org.example" ThisBuild / version := "1.0" lazy val a = project.settings(common: _*).settings( - // verifies that a can be published as an ivy.xml file and preserve the extra artifact information, - // such as a classifier - libraryDependencies := Seq("net.sf.json-lib" % "json-lib" % "2.4" classifier "jdk15" intransitive()), - // verifies that an artifact without an explicit configuration gets published in all public configurations - artifact in (Compile,packageBin) := Artifact("demo") + // verifies that a can be published as an ivy.xml file and preserve the extra artifact information, + // such as a classifier + libraryDependencies := Seq(("net.sf.json-lib" % "json-lib" % "2.4").classifier("jdk15").intransitive()), + // verifies that an artifact without an explicit configuration gets published in all public configurations + (Compile / packageBin / artifact) := Artifact("demo") ) lazy val b = project.settings(common: _*).settings( - libraryDependencies := Seq(organization.value %% "a" % version.value) + libraryDependencies := Seq(organization.value %% "a" % version.value) ) lazy val common = Seq( - autoScalaLibrary := false, // avoid downloading fresh scala-library/scala-compiler - managedScalaInstance := false, - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")) + autoScalaLibrary := false, // avoid downloading fresh scala-library/scala-compiler + managedScalaInstance := false, + ivyPaths := IvyPaths( (ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")) ) diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/build.sbt b/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/build.sbt index 15e4df170..e9e171f3a 100644 --- a/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/build.sbt @@ -24,10 +24,10 @@ lazy val b = (project in file("b")). lazy val root = (project in file(".")). settings( check := { - (update in a).value - (update in b).value - val acp = (externalDependencyClasspath in Compile in a).value.sortBy {_.data.getName} - val bcp = (externalDependencyClasspath in Compile in b).value.sortBy {_.data.getName} + (a / update).value + (b / update).value + val acp = (a / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} + val bcp = (b / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} if (acp exists { _.data.getName contains "slf4j-api-1.7.5.jar" }) { sys.error("slf4j-api-1.7.5.jar found when it should NOT be included: " + acp.toString) @@ -36,7 +36,7 @@ lazy val root = (project in file(".")). sys.error("dispatch-core_2.11-0.11.1.jar found when it should NOT be included: " + bcp.toString) } - val bPomXml = makePomXml(streams.value.log, (makePomConfiguration in b).value, (ivyModule in b).value) + val bPomXml = makePomXml(streams.value.log, (b / makePomConfiguration).value, (b / ivyModule).value) val repatchTwitterXml = bPomXml \ "dependencies" \ "dependency" find { d => (d \ "groupId").text == "com.eed3si9n" && (d \ "artifactId").text == "repatch-twitter-core_2.11" diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/test b/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/exclude-dependencies/test rename to sbt-app/src/sbt-test/dependency-management/exclude-dependencies/pending diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/test b/sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/test rename to sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/pending diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt b/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt index 338b358ab..50a29e584 100644 --- a/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt @@ -11,7 +11,7 @@ lazy val root = (project in file(".")). scalaOverride := check("scala.App").value ) -def check(className: String): Def.Initialize[Task[Unit]] = fullClasspath in Compile map { cp => +def check(className: String): Def.Initialize[Task[Unit]] = (Compile / fullClasspath) map { cp => val existing = cp.files.filter(_.getName contains "scala-library") println("Full classpath: " + cp.mkString("\n\t", "\n\t", "")) println("scala-library.jar: " + existing.mkString("\n\t", "\n\t", "")) diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt b/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt index cd6c3ec92..1d989540d 100644 --- a/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt @@ -1,4 +1,5 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" +ThisBuild / scalaVersion := "2.12.17" lazy val root = (project in file(".")). settings( @@ -12,7 +13,7 @@ def transitive(dep: ModuleID)(base: File) = if((base / "transitive").exists) dep else dep.intransitive() def check(transitive: Boolean) = - (dependencyClasspath in Compile) map { downloaded => + (Compile / dependencyClasspath) map { downloaded => val jars = downloaded.size if(transitive) { if (jars <= 2) diff --git a/sbt-app/src/sbt-test/dependency-management/force/build.sbt b/sbt-app/src/sbt-test/dependency-management/force/build.sbt index 2a8a64b04..b2109f589 100644 --- a/sbt-app/src/sbt-test/dependency-management/force/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/force/build.sbt @@ -10,11 +10,11 @@ lazy val root = (project in file(".")). def libraryDeps(base: File) = { val slf4j = Seq("org.slf4j" % "slf4j-log4j12" % "1.1.0") // Uses log4j 1.2.13 - if ((base / "force").exists) slf4j :+ ("log4j" % "log4j" % "1.2.14" force()) else slf4j + if ((base / "force").exists) slf4j :+ ("log4j" % "log4j" % "1.2.14").force() else slf4j } def check(ver: String) = - (dependencyClasspath in Compile) map { jars => + (Compile / dependencyClasspath) map { jars => val log4j = jars map (_.data) collect { case f if f.getName contains "log4j-" => f.getName } diff --git a/sbt-app/src/sbt-test/dependency-management/global-plugins/disable b/sbt-app/src/sbt-test/dependency-management/global-plugins/disabled similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/global-plugins/disable rename to sbt-app/src/sbt-test/dependency-management/global-plugins/disabled diff --git a/sbt-app/src/sbt-test/dependency-management/info/build.sbt b/sbt-app/src/sbt-test/dependency-management/info/build.sbt index 5ae25bd00..8c46f1265 100644 --- a/sbt-app/src/sbt-test/dependency-management/info/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/info/build.sbt @@ -31,7 +31,7 @@ def inlineXML(addInfo: Boolean, organization: String, moduleID: String, version: def checkDownload = Def task { - if ((dependencyClasspath in Compile).value.isEmpty) sys.error("Dependency not downloaded"); () + if ((Compile / dependencyClasspath).value.isEmpty) sys.error("Dependency not downloaded"); () } def checkInfo = Def task { diff --git a/sbt-app/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt b/sbt-app/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt index fb1c5ca87..0a1c74289 100644 --- a/sbt-app/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt @@ -6,8 +6,8 @@ ivyPaths := baseDirectory( dir => IvyPaths(dir, Some(dir / "ivy-home"))).value TaskKey[Unit]("check") := { val report = update.value - val files = report.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck", revision = "1.5") ) - assert(files.nonEmpty, "ScalaCheck module not found in update report") - val missing = files.filter(! _.exists) - assert(missing.isEmpty, "Reported ScalaCheck artifact files don't exist: " + missing.mkString(", ")) + val files = report.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck", revision = "1.5") ) + assert(files.nonEmpty, "ScalaCheck module not found in update report") + val missing = files.filter(! _.exists) + assert(missing.isEmpty, "Reported ScalaCheck artifact files don't exist: " + missing.mkString(", ")) } diff --git a/sbt-app/src/sbt-test/dependency-management/inter-project/test b/sbt-app/src/sbt-test/dependency-management/inter-project/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/inter-project/test rename to sbt-app/src/sbt-test/dependency-management/inter-project/pending diff --git a/sbt-app/src/sbt-test/dependency-management/ivy-settings-c/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivy-settings-c/build.sbt index 2e7cbd392..c93bab708 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivy-settings-c/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivy-settings-c/build.sbt @@ -3,9 +3,9 @@ ThisBuild / useCoursier := false lazy val commonSettings = Seq( autoScalaLibrary := false, scalaModuleInfo := None, - unmanagedJars in Compile ++= (scalaInstance map (_.allJars.toSeq)).value, - publishArtifact in packageSrc := false, - publishArtifact in packageDoc := false, + (Compile / unmanagedJars) ++= (scalaInstance map (_.allJars.toSeq)).value, + (packageSrc / publishArtifact) := false, + (packageDoc / publishArtifact) := false, publishMavenStyle := false ) @@ -14,7 +14,7 @@ lazy val dep = project. commonSettings, organization := "org.example", version := "1.0", - publishTo := (baseDirectory in ThisBuild apply { base => + publishTo := ((ThisBuild / baseDirectory) apply { base => Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns)) }).value ) @@ -28,7 +28,7 @@ lazy val use = project. Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns)) }).value, TaskKey[Unit]("check") := (baseDirectory map {base => - val inCache = ( (base / "target" / "use-cache") ** "*.jar").get + val inCache = ( (base / "target" / "use-cache") ** "*.jar").get() assert(inCache.isEmpty, "Cache contained jars: " + inCache) }).value ) diff --git a/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/test b/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/latest-local-plugin/test rename to sbt-app/src/sbt-test/dependency-management/latest-local-plugin/pending diff --git a/sbt-app/src/sbt-test/dependency-management/make-pom-type/build.sbt b/sbt-app/src/sbt-test/dependency-management/make-pom-type/build.sbt index 6d9005519..2de1a2dd4 100644 --- a/sbt-app/src/sbt-test/dependency-management/make-pom-type/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/make-pom-type/build.sbt @@ -1,7 +1,7 @@ lazy val p1 = (project in file("p1")). settings( checkTask(expectedMongo), - libraryDependencies += "org.mongodb" %% "casbah" % "2.4.1" pomOnly(), + libraryDependencies += ("org.mongodb" %% "casbah" % "2.4.1").pomOnly(), inThisBuild(List( organization := "org.example", version := "1.0", diff --git a/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt b/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt index 4b8870e04..09e992ccf 100644 --- a/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt @@ -5,7 +5,7 @@ moduleName := "asdf" crossPaths := false TaskKey[Unit]("checkName") := Def task { - val path = (packageBin in Compile).value.getAbsolutePath + val path = (Compile / packageBin).value.getAbsolutePath val module = moduleName.value val n = name.value assert(path contains module, s"Path $path did not contain module name $module") diff --git a/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt b/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt index d18d8e278..eeacc0676 100644 --- a/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq("natives-windows", "natives-linux", "natives-osx") m autoScalaLibrary := false -TaskKey[Unit]("check") := (dependencyClasspath in Compile map { cp => +TaskKey[Unit]("check") := ((Compile / dependencyClasspath) map { cp => assert(cp.size == 3, "Expected 3 jars, got: " + cp.files.mkString("(", ", ", ")")) }).value diff --git a/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/changes/non-mergeable.sbt b/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/changes/non-mergeable.sbt index e41cc71f6..823ae5825 100644 --- a/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/changes/non-mergeable.sbt +++ b/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/changes/non-mergeable.sbt @@ -1,14 +1,15 @@ libraryDependencies ++= Seq( - "org.easytesting" % "fest-assert" % "1.4", - "org.easytesting" % "fest-assert" % "1.4" % "test" intransitive()) + "org.easytesting" % "fest-assert" % "1.4", + ("org.easytesting" % "fest-assert" % "1.4" % Test).intransitive(), +) autoScalaLibrary := false TaskKey[Unit]("check") := { - val cp = (externalDependencyClasspath in Compile).value - val tcp = (externalDependencyClasspath in Test).value + val cp = (Compile / externalDependencyClasspath).value + val tcp = (Test / externalDependencyClasspath).value assert(cp.size == 2, "Expected 2 jars on compile classpath, got: " + cp.files.mkString("(", ", ", ")")) - // this should really be 1 because of intransitive(), but Ivy doesn't handle this. - // So, this test can only check that the assertion reported in #582 isn't triggered. + // this should really be 1 because of intransitive(), but Ivy doesn't handle this. + // So, this test can only check that the assertion reported in #582 isn't triggered. assert(tcp.size == 2, "Expected 2 jar on test classpath, got: " + tcp.files.mkString("(", ", ", ")")) } diff --git a/sbt-app/src/sbt-test/dependency-management/override/build.sbt b/sbt-app/src/sbt-test/dependency-management/override/build.sbt index 0508fa0d7..8398dfe04 100644 --- a/sbt-app/src/sbt-test/dependency-management/override/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/override/build.sbt @@ -5,8 +5,8 @@ autoScalaLibrary := false ivyPaths := IvyPaths(baseDirectory.value, Some(target.value / "ivy-cache")) scalaModuleInfo := Some(sbt.librarymanagement.ScalaModuleInfo( - (scalaVersion in update).value, - (scalaBinaryVersion in update).value, + (update / scalaVersion).value, + (update / scalaBinaryVersion).value, Vector.empty, checkExplicit = false, filterImplicit = false, diff --git a/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt index 0fd69fb42..2da229089 100644 --- a/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt @@ -21,8 +21,8 @@ val local = "local-maven-repo" at "file://" + (Path.userHome / ".m2" /"repositor def pomIncludeRepository(base: File, prev: MavenRepository => Boolean): MavenRepository => Boolean = { case r: MavenRepository if (r.name == "local-preloaded") => false - case r: MavenRepository if (base / "repo.none" exists) => false - case r: MavenRepository if (base / "repo.all" exists) => true + case r: MavenRepository if (base / "repo.none").exists => false + case r: MavenRepository if (base / "repo.all").exists => true case r: MavenRepository => prev(r) } @@ -31,9 +31,9 @@ def addSlash(s: String): String = s match { case _ => s + "/" } -def checkPomRepositories(file: File, args: Seq[String], s: TaskStreams) { +def checkPomRepositories(file: File, args: Seq[String], s: TaskStreams): Unit = { val repositories = scala.xml.XML.loadFile(file) \\ "repository" - val extracted = repositories.map { repo => MavenRepository(repo \ "name" text, addSlash(repo \ "url" text)) } + val extracted = repositories.map { repo => MavenRepository((repo \ "name").text, addSlash((repo \ "url").text)) } val expected = args.map(GlobFilter.apply) s.log.info("Extracted: " + extracted.mkString("\n\t", "\n\t", "\n")) s.log.info("Expected: " + args.mkString("\n\t", "\n\t", "\n")) diff --git a/sbt-app/src/sbt-test/dependency-management/pom-advanced/test b/sbt-app/src/sbt-test/dependency-management/pom-advanced/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/pom-advanced/test rename to sbt-app/src/sbt-test/dependency-management/pom-advanced/pending diff --git a/sbt-app/src/sbt-test/dependency-management/pom-classpaths/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-classpaths/build.sbt index 8e57b688a..723eba908 100644 --- a/sbt-app/src/sbt-test/dependency-management/pom-classpaths/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/pom-classpaths/build.sbt @@ -8,7 +8,7 @@ lazy val root = (project in file(".")). externalPom(), scalaVersion := "2.9.0-1", check := checkTask.evaluated, - managedClasspath in Provided := Classpaths.managedJars(Provided, classpathTypes.value, update.value) + (Provided / managedClasspath) := Classpaths.managedJars(Provided, classpathTypes.value, update.value) ) def checkTask = Def.inputTask { @@ -16,18 +16,17 @@ def checkTask = Def.inputTask { val (conf, names) = result println("Checking: " + conf.name) checkClasspath(conf match { - case Provided => managedClasspath in Provided value - case Compile => fullClasspath in Compile value - case Test => fullClasspath in Test value - case Runtime => fullClasspath in Runtime value + case Provided => (Provided / managedClasspath).value + case Compile => (Compile / fullClasspath).value + case Test => (Test / fullClasspath).value + case Runtime => (Runtime / fullClasspath).value }, names.toSet) } lazy val check = InputKey[Unit]("check") def parser: Parser[(Configuration,Seq[String])] = (Space ~> token(cp(Compile) | cp(Runtime) | cp(Provided) | cp(Test))) ~ spaceDelimited("") def cp(c: Configuration): Parser[Configuration] = c.name ^^^ c -def checkClasspath(cp: Seq[Attributed[File]], names: Set[String]) = -{ +def checkClasspath(cp: Seq[Attributed[File]], names: Set[String]) = { val fs = cp.files filter { _.getName endsWith ".jar" } val intersect = fs filter { f => names exists { f.getName startsWith _ } } assert(intersect == fs, "Expected:" + seqStr(names.toSeq) + "Got: " + seqStr(fs)) diff --git a/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt index 174a827f3..8f19e3462 100644 --- a/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt @@ -2,16 +2,16 @@ val root = project in file(".") val subJar = project in file("subJar") -def warArtifact = artifact in (Compile, packageBin) ~= (_ withType "war" withExtension "war") +def warArtifact = (Compile / packageBin / artifact) ~= (_ withType "war" withExtension "war") val subWar = project in file("subWar") settings warArtifact -val subParent = project in file("subParent") settings (publishArtifact in Compile := false) +val subParent = project in file("subParent") settings ((Compile / publishArtifact) := false) val checkPom = taskKey[Unit]("") -checkPom in ThisBuild := { - checkPackaging((makePom in subJar).value, "jar") - checkPackaging((makePom in subWar).value, "war") - checkPackaging((makePom in subParent).value, "pom") +(ThisBuild / checkPom) := { + checkPackaging((subJar / makePom).value, "jar") + checkPackaging((subWar / makePom).value, "war") + checkPackaging((subParent / makePom).value, "pom") } def checkPackaging(pom: File, expected: String) = { diff --git a/sbt-app/src/sbt-test/dependency-management/pom-parent-pom/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-parent-pom/build.sbt index 32ba36863..e6eed4c76 100644 --- a/sbt-app/src/sbt-test/dependency-management/pom-parent-pom/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/pom-parent-pom/build.sbt @@ -6,7 +6,7 @@ val checkIvyXml = taskKey[Unit]("Checks the ivy.xml transform was correct") lazy val root = (project in file(".")). settings( name := "test-parent-pom", - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")), + ivyPaths := IvyPaths( (ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), resolvers += MavenCache("Maven2 Local Test", baseDirectory.value / "local-repo"), libraryDependencies += "com.example" % "example-child" % "1.0-SNAPSHOT", libraryDependencies += "org.apache.geronimo.specs" % "geronimo-jta_1.1_spec" % "1.1.1", diff --git a/sbt-app/src/sbt-test/dependency-management/pom-type/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-type/build.sbt index b83e9fbbb..5c03c5e61 100644 --- a/sbt-app/src/sbt-test/dependency-management/pom-type/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/pom-type/build.sbt @@ -3,17 +3,17 @@ lazy val checkPom = taskKey[Unit]("check pom to ensure no sections are ge lazy val root = (project in file(".")). settings( scalaVersion := "2.10.6", - libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.1" withSources() withJavadoc(), - libraryDependencies += "org.scala-sbt" % "io" % "0.13.8" intransitive(), + libraryDependencies += { ("org.scala-tools.sbinary" %% "sbinary" % "0.4.1").withSources().withJavadoc() }, + libraryDependencies += { ("org.scala-sbt" % "io" % "0.13.8").intransitive() }, checkPom := { val pomFile = makePom.value val pom = xml.XML.loadFile(pomFile) val tpe = pom \\ "type" - if(tpe.nonEmpty) { + if (tpe.nonEmpty) { sys.error("Expected no sections, got: " + tpe + " in \n\n" + pom) } val ur = update.value - val dir = (streams in update).value.cacheDirectory / "out" + val dir = (update / streams).value.cacheDirectory / "out" val lines = IO.readLines(dir) val hasError = lines exists { line => line contains "Found intransitive dependency "} assert(hasError, s"Failed to detect intransitive dependencies, got: ${lines.mkString("\n")}") diff --git a/sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt b/sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt index 4765c39d3..d05f21338 100644 --- a/sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt +++ b/sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt @@ -1,19 +1,22 @@ +ThisBuild / scalaVersion := "2.12.17" def configIvyScala = scalaModuleInfo ~= (_ map (_ withCheckExplicit false)) val declared = SettingKey[Boolean]("declared") -lazy val a = project. - settings( +lazy val a = project + .settings( libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided", configIvyScala, - scalaBinaryVersion in update := "2.9.0" + update / scalaBinaryVersion := "2.9.0", ) -lazy val b = project. - dependsOn(a). - settings( - libraryDependencies := declared(d => if(d) Seq("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided") else Nil).value, - declared := baseDirectory(_ / "declare.lib" exists).value, +lazy val b = project + .dependsOn(a) + .settings( + libraryDependencies := declared((d) => + if (d) Seq("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided") + else Nil).value, + declared := baseDirectory((dir) => (dir / "declare.lib").exists).value, configIvyScala, - scalaBinaryVersion in update := "2.9.0" + update / scalaBinaryVersion := "2.9.0" ) diff --git a/sbt-app/src/sbt-test/dependency-management/provided/build.sbt b/sbt-app/src/sbt-test/dependency-management/provided/build.sbt index 3f01f3c0d..bc3e7118f 100644 --- a/sbt-app/src/sbt-test/dependency-management/provided/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/provided/build.sbt @@ -5,20 +5,20 @@ val check = InputKey[Unit]("check") lazy val root = (project in file(".")). settings( - provided := (baseDirectory.value / "useProvided" exists), + provided := (baseDirectory.value / "useProvided").exists, configuration := (if (provided.value) Provided else Compile), libraryDependencies += "javax.servlet" % "servlet-api" % "2.5" % configuration.value.name, - managedClasspath in Provided := Classpaths.managedJars(Provided, classpathTypes.value, update.value), + Provided / managedClasspath := Classpaths.managedJars(Provided, classpathTypes.value, update.value), check := { val result = ( Space ~> token(Compile.name.id | Runtime.name | Provided.name | Test.name) ~ token(Space ~> Bool) ).parsed val (conf, expected) = result val cp = conf match { - case Compile.name => (fullClasspath in Compile).value - case Runtime.name => (fullClasspath in Runtime).value - case Provided.name => (managedClasspath in Provided).value - case Test.name => (fullClasspath in Test).value + case Compile.name => (Compile / fullClasspath).value + case Runtime.name => (Runtime / fullClasspath).value + case Provided.name => (Provided / managedClasspath).value + case Test.name => (Test / fullClasspath).value case _ => sys.error(s"Invalid config: $conf") } checkServletAPI(cp.files, expected, conf) diff --git a/sbt-app/src/sbt-test/dependency-management/scala-organization/build.sbt b/sbt-app/src/sbt-test/dependency-management/scala-organization/build.sbt index 068fe0611..70ca638a2 100644 --- a/sbt-app/src/sbt-test/dependency-management/scala-organization/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/scala-organization/build.sbt @@ -6,7 +6,7 @@ scalaOrganization := "org.other" scalaVersion := "2.11.8" -resolvers += Resolver.file("buggy", (baseDirectory in LocalRootProject).value / "repo")( +resolvers += Resolver.file("buggy", (LocalRootProject / baseDirectory).value / "repo")( Patterns( ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"), artifactPatterns = Vector("[organization]/[module]/[revision]/dummy.jar"), diff --git a/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt b/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt index 64fad402b..4bed67f37 100644 --- a/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt @@ -1,3 +1,4 @@ +ThisBuild / scalaVersion := "2.12.17" autoScalaLibrary := false libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value % "test" diff --git a/sbt-app/src/sbt-test/dependency-management/scala3-scala-organization/build.sbt b/sbt-app/src/sbt-test/dependency-management/scala3-scala-organization/build.sbt index dfd1b73e5..9e28860dd 100644 --- a/sbt-app/src/sbt-test/dependency-management/scala3-scala-organization/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/scala3-scala-organization/build.sbt @@ -3,7 +3,7 @@ ThisBuild / useCoursier := false scalaOrganization := "org.other" scalaVersion := "3.0.0-M2" -resolvers += Resolver.file("buggy", (baseDirectory in LocalRootProject).value / "repo")( +resolvers += Resolver.file("buggy", (LocalRootProject / baseDirectory).value / "repo")( Patterns( ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"), artifactPatterns = Vector("[organization]/[module]/[revision]/dummy.jar"), diff --git a/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt index 6d5248abf..0a2c2e42b 100644 --- a/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt @@ -3,7 +3,7 @@ ThisBuild / scalaVersion := "2.12.12" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" def customIvyPaths: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths((baseDirectory in ThisBuild).value, Some((baseDirectory in ThisBuild).value / "ivy-cache")) + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((ThisBuild / baseDirectory).value / "ivy-cache")) ) lazy val sharedResolver: Resolver = { diff --git a/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt b/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt index 4ea3c8582..b1e15032d 100644 --- a/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt @@ -49,7 +49,7 @@ lazy val dependent = project TaskKey[Unit]("dumpResolvers") := { val log = streams.value.log log.info(s" -- dependent/fullResolvers -- ") - (fullResolvers in dependent).value foreach { r => + (dependent / fullResolvers).value foreach { r => log.info(s" * ${r}") } } diff --git a/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt b/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt index 91f35d197..cd9dbe3d3 100644 --- a/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt @@ -2,13 +2,13 @@ ThisBuild / useCoursier := false lazy val root = (project in file(".")) .settings( - libraryDependencies += "net.liftweb" % "lift-webkit" % "1.0" intransitive(), - libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5" intransitive(), + libraryDependencies += ("net.liftweb" % "lift-webkit" % "1.0").intransitive(), + libraryDependencies += ("org.scalacheck" % "scalacheck" % "1.5").intransitive(), autoScalaLibrary := false, managedScalaInstance := false, transitiveClassifiers := Seq("sources"), TaskKey[Unit]("checkSources") := (updateClassifiers map checkSources).value, - TaskKey[Unit]("checkBinaries") := (update map checkBinaries).value + TaskKey[Unit]("checkBinaries") := (update map checkBinaries).value, ) def getSources(report: UpdateReport) = report.matching(artifactFilter(`classifier` = "sources") ) diff --git a/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/def/build.sbt b/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/def/build.sbt index 0138592a3..127ecd6c6 100644 --- a/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/def/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/def/build.sbt @@ -6,4 +6,4 @@ version := "2.0" publishTo := Some(Resolver.file("example", baseDirectory.value / "ivy-repo")) -publishArtifact in Test := true +Test / publishArtifact := true diff --git a/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt b/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt index 3bebeda6d..5583686d4 100644 --- a/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt @@ -9,9 +9,9 @@ libraryDependencies += "exclude.test" % "app" % "1.0.0" val checkDependencies = taskKey[Unit]("Checks that dependencies are correct.") checkDependencies := { - val hasBadJar = (fullClasspath in Compile).value.exists { jar => jar.data.getName contains "bottom-1.0.0.jar"} - val errorJarString = (fullClasspath in Compile).value.map(_.data.getName).mkString(" * ", "\n * ", "") - val hasBadMiddleJar = (fullClasspath in Compile).value.exists { jar => jar.data.getName contains "middle-1.0.0.jar"} + val hasBadJar = (Compile / fullClasspath).value.exists { jar => jar.data.getName contains "bottom-1.0.0.jar"} + val errorJarString = (Compile / fullClasspath).value.map(_.data.getName).mkString(" * ", "\n * ", "") + val hasBadMiddleJar = (Compile / fullClasspath).value.exists { jar => jar.data.getName contains "middle-1.0.0.jar"} assert(!hasBadMiddleJar, s"Failed to exclude excluded dependency on classpath!\nFound:\n$errorJarString") assert(!hasBadJar, s"Failed to exclude transitive excluded dependency on classpath!\nFound:\n$errorJarString") val modules = diff --git a/sbt-app/src/sbt-test/dependency-management/url/build.sbt b/sbt-app/src/sbt-test/dependency-management/url/build.sbt index 54ae274cf..bed0ea857 100644 --- a/sbt-app/src/sbt-test/dependency-management/url/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/url/build.sbt @@ -12,7 +12,7 @@ lazy val root = (project in file(".")). ) def checkClasspath(conf: Configuration) = - fullClasspath in conf map { cp => + (conf / fullClasspath) map { cp => try { val loader = ClasspathUtilities.toLoader(cp.files) Class.forName("org.jsoup.Jsoup", false, loader) diff --git a/sbt-app/src/sbt-test/dependency-management/version-interval/test b/sbt-app/src/sbt-test/dependency-management/version-interval/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/version-interval/test rename to sbt-app/src/sbt-test/dependency-management/version-interval/pending diff --git a/sbt-app/src/sbt-test/java/argfile/build.sbt b/sbt-app/src/sbt-test/java/argfile/build.sbt index 399821afc..c31ca0ae8 100644 --- a/sbt-app/src/sbt-test/java/argfile/build.sbt +++ b/sbt-app/src/sbt-test/java/argfile/build.sbt @@ -1,9 +1,9 @@ -scalaSource in Configurations.Compile := (sourceDirectory.value / " scala test ") - javaSource in Configurations.Compile := (sourceDirectory.value / " java test ") +Configurations.Compile / scalaSource := (sourceDirectory.value / " scala test ") +Configurations.Compile / javaSource := (sourceDirectory.value / " java test ") TaskKey[Unit]("init") := { - val ss = (scalaSource in Configurations.Compile).value - val js = ( javaSource in Configurations.Compile).value + val ss = (Configurations.Compile / scalaSource).value + val js = (Configurations.Compile / javaSource).value import IO._ createDirectories(ss :: js :: Nil) copyFile(file("changes") / "Test.scala", ss / " Test s.scala") diff --git a/sbt-app/src/sbt-test/java/argfile/changes/Test.scala b/sbt-app/src/sbt-test/java/argfile/changes/Test.scala index 16e70b30e..d6d018657 100644 --- a/sbt-app/src/sbt-test/java/argfile/changes/Test.scala +++ b/sbt-app/src/sbt-test/java/argfile/changes/Test.scala @@ -1,7 +1,5 @@ -object Test -{ - def main(args: Array[String]) - { - println(new a.A) - } -} \ No newline at end of file +object Test { + def main(args: Array[String]): Unit = { + println(new a.A) + } +} diff --git a/sbt-app/src/sbt-test/java/no-scala-tool/test b/sbt-app/src/sbt-test/java/no-scala-tool/pending similarity index 100% rename from sbt-app/src/sbt-test/java/no-scala-tool/test rename to sbt-app/src/sbt-test/java/no-scala-tool/pending diff --git a/sbt-app/src/sbt-test/java/track-anonymous/build.sbt b/sbt-app/src/sbt-test/java/track-anonymous/build.sbt index b0c61b63f..1dacbc629 100644 --- a/sbt-app/src/sbt-test/java/track-anonymous/build.sbt +++ b/sbt-app/src/sbt-test/java/track-anonymous/build.sbt @@ -1,14 +1,14 @@ { - import complete.DefaultParsers._ - val parser = token(Space ~> ( ("exists" ^^^ true) | ("absent" ^^^ false) ) ) - InputKey[Unit]("checkOutput") := { - val shouldExist = parser.parsed - val dir = (classDirectory in Compile).value - if((dir / "Anon.class").exists != shouldExist) - sys.error("Top level class incorrect" ) - else if( (dir / "Anon$1.class").exists != shouldExist) - sys.error("Inner class incorrect" ) - else - () - } + import complete.DefaultParsers._ + val parser = token(Space ~> ( ("exists" ^^^ true) | ("absent" ^^^ false) ) ) + InputKey[Unit]("checkOutput") := { + val shouldExist = parser.parsed + val dir = (Compile / classDirectory).value + if((dir / "Anon.class").exists != shouldExist) + sys.error("Top level class incorrect" ) + else if( (dir / "Anon$1.class").exists != shouldExist) + sys.error("Inner class incorrect" ) + else + () + } } diff --git a/sbt-app/src/sbt-test/project/auto-import/project/P.scala b/sbt-app/src/sbt-test/project/auto-import/project/P.scala index 38b2f9949..70e309a38 100644 --- a/sbt-app/src/sbt-test/project/auto-import/project/P.scala +++ b/sbt-app/src/sbt-test/project/auto-import/project/P.scala @@ -22,8 +22,8 @@ package name.example { import autoImport._ override def projectSettings = Seq[Setting[_]]( - checkMaxErrors := (Keys.maxErrors mapN { me => assert(me == xyz, "Expected maxErrors to be " + xyz + ", but it was " + me ) }).value, - checkName := (Keys.name mapN { n => assert(n == "Demo", "Expected name to be 'Demo', but it was '" + n + "'" ) }).value + checkMaxErrors := (Keys.maxErrors map { me => assert(me == xyz, "Expected maxErrors to be " + xyz + ", but it was " + me ) }).value, + checkName := (Keys.name map { n => assert(n == "Demo", "Expected name to be 'Demo', but it was '" + n + "'" ) }).value ) } } diff --git a/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/test b/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/pending similarity index 100% rename from sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/test rename to sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/pending diff --git a/sbt-app/src/sbt-test/project/binary-plugin/test b/sbt-app/src/sbt-test/project/binary-plugin/pending similarity index 100% rename from sbt-app/src/sbt-test/project/binary-plugin/test rename to sbt-app/src/sbt-test/project/binary-plugin/pending diff --git a/sbt-app/src/sbt-test/project/console/build.sbt b/sbt-app/src/sbt-test/project/console/build.sbt index 6e41add22..131b111d6 100644 --- a/sbt-app/src/sbt-test/project/console/build.sbt +++ b/sbt-app/src/sbt-test/project/console/build.sbt @@ -1,3 +1,4 @@ +ThisBuild / scalaVersion := "2.12.17" lazy val root = (project in file(".")) lazy val sub1 = (project in file("sub1")) lazy val sub2 = (project in file("sub2")) diff --git a/sbt-app/src/sbt-test/project/default-settings/build.sbt b/sbt-app/src/sbt-test/project/default-settings/build.sbt index d910b30ac..f96e904fd 100644 --- a/sbt-app/src/sbt-test/project/default-settings/build.sbt +++ b/sbt-app/src/sbt-test/project/default-settings/build.sbt @@ -2,7 +2,7 @@ val root = (project in file(".")) TaskKey[Unit]("checkScalaVersion", "test") := { val sv = scalaVersion.value - assert(sv startsWith "2.12.", s"Found $sv!") + assert(sv startsWith "3.", s"Found $sv!") } TaskKey[Unit]("checkArtifacts", "test") := { diff --git a/sbt-app/src/sbt-test/project/derived/build.sbt b/sbt-app/src/sbt-test/project/derived/build.sbt index 21cfc9207..2525f9568 100644 --- a/sbt-app/src/sbt-test/project/derived/build.sbt +++ b/sbt-app/src/sbt-test/project/derived/build.sbt @@ -10,15 +10,15 @@ lazy val customE = taskKey[String]("custom E") lazy val globalDepE = taskKey[String]("globally defined dependency of E") lazy val projectDepE = taskKey[String]("per-project dependency of E") -organization in Global := "org.example" +(Global / organization) := "org.example" -version in Global := "1.0" +(Global / version) := "1.0" -customC in Global := "base" +(Global / customC) := "base" -name in Global := "global-name" +(Global / name) := "global-name" -globalDepE in Global := "globalE" +(Global / globalDepE) := "globalE" // ---------------- Derived settings @@ -61,30 +61,30 @@ def same[T](x: T, y: T): Unit = { } check := { - val aa = (customA in a).value + val aa = (a / customA).value same(aa, "a-b-a") - val bb = (customB in b).value + val bb = (b / customB).value same(bb, explicit) - val ac = (customC in a).value + val ac = (a / customC).value // TODO - Setting with multiple triggers is no longer added just once... //same(ac, "org.example-base-1.0") - val globalD = (customD in Global).?.value + val globalD = (Global / customD).?.value same(globalD, None) - val aD = (customD in a).value - val bD = (customD in b).value + val aD = (a / customD).value + val bD = (b / customD).value same(aD, "a") same(bD, "b") - val globalE = (customE in Global).?.value + val globalE = (Global / customE).?.value same(globalE, None) - val aE = (customE in a).value - val bE = (customE in b).value + val aE = (a / customE).value + val bE = (b / customE).value same(aE, "globalE-A") same(bE, "globalE-B") } checkEvery := { - val aD = (customD in a).value + val aD = (a / customD).value same(aD, "every") - val gD = (customD in b).value + val gD = (b / customD).value same(gD, "every") } diff --git a/sbt-app/src/sbt-test/project/derived/test b/sbt-app/src/sbt-test/project/derived/pending similarity index 100% rename from sbt-app/src/sbt-test/project/derived/test rename to sbt-app/src/sbt-test/project/derived/pending diff --git a/sbt-app/src/sbt-test/project/extra/build.sbt b/sbt-app/src/sbt-test/project/extra/build.sbt index 556d3e61b..ecc1b85e9 100644 --- a/sbt-app/src/sbt-test/project/extra/build.sbt +++ b/sbt-app/src/sbt-test/project/extra/build.sbt @@ -14,7 +14,7 @@ lazy val root = (project in file(".")). def addExtra(name: String, f: (State, Seq[File]) => State) = Command.command(name) { s => - f(s, (file("lib_managed") ** "*.jar").get) + f(s, (file("lib_managed") ** "*.jar").get()) } def checkExtra = Command.command("check") { s => @@ -23,23 +23,24 @@ def checkExtra = assert(loader eq sbtLoader, "Different loader for sbt and extra: " + sbtLoader + " and " + loader) s } + def addExtra1(s: State, extra: Seq[File]): State = { val cs = s.configuration.provider.components() val copied = cs.addToComponent("extra", extra.toArray) if(copied) s.reload else s } -def addExtra2(s: State, extra: Seq[File]): State = + +def addExtra2(s: State, extra: Seq[File]): State = { + val reload = State.defaultReload(s) + val currentID = reload.app + val currentExtra = currentID.classpathExtra + val newExtra = (currentExtra ++ extra).distinct + if(newExtra.length == currentExtra.length) + s + else { - val reload = State.defaultReload(s) - val currentID = reload.app - val currentExtra = currentID.classpathExtra - val newExtra = (currentExtra ++ extra).distinct - if(newExtra.length == currentExtra.length) - s - else - { - val newID = ApplicationID(currentID).copy(extra = extra) - s.setNext(new State.Return(reload.copy(app = newID))) - } + val newID = ApplicationID(currentID).copy(extra = extra) + s.setNext(new State.Return(reload.copy(app = newID))) } +} diff --git a/sbt-app/src/sbt-test/project/extra/test b/sbt-app/src/sbt-test/project/extra/pending similarity index 100% rename from sbt-app/src/sbt-test/project/extra/test rename to sbt-app/src/sbt-test/project/extra/pending diff --git a/sbt-app/src/sbt-test/project/flatten/build.sbt b/sbt-app/src/sbt-test/project/flatten/build.sbt index 5e39482e1..3e3f1da00 100644 --- a/sbt-app/src/sbt-test/project/flatten/build.sbt +++ b/sbt-app/src/sbt-test/project/flatten/build.sbt @@ -10,7 +10,7 @@ lazy val root = (project in file(".")) unmanagedSources / includeFilter := "*.java" | "*.scala" ) -def forConfig(conf: Configuration, name: String) = Project.inConfig(conf)( unpackageSettings(name) ) +def forConfig(conf: Configuration, name: String) = inConfig(conf)( unpackageSettings(name) ) def unpackageSettings(name: String) = Seq( unmanagedSourceDirectories := (baseDirectory.value / name) :: Nil, diff --git a/sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt b/sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt index d97e40622..ae666eb28 100644 --- a/sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt +++ b/sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt @@ -1,3 +1,4 @@ +ThisBuild / scalaVersion := "2.12.17" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" val commonSettings = Seq( diff --git a/sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt b/sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt index f614ef398..80e595cfb 100644 --- a/sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt +++ b/sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt @@ -1,5 +1,6 @@ +ThisBuild / scalaVersion := "2.12.17" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" organization := "com.example" version := "0.1.0" -ivyPaths := IvyPaths((baseDirectory in LocalRootProject).value, Some((target in LocalRootProject).value / "ivy-cache")) +ivyPaths := IvyPaths((LocalRootProject / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")) diff --git a/sbt-app/src/sbt-test/project/giter8-plugin/test b/sbt-app/src/sbt-test/project/giter8-plugin/pending similarity index 100% rename from sbt-app/src/sbt-test/project/giter8-plugin/test rename to sbt-app/src/sbt-test/project/giter8-plugin/pending diff --git a/sbt-app/src/sbt-test/project/ignore-hidden-build-files/test b/sbt-app/src/sbt-test/project/ignore-hidden-build-files/pending similarity index 100% rename from sbt-app/src/sbt-test/project/ignore-hidden-build-files/test rename to sbt-app/src/sbt-test/project/ignore-hidden-build-files/pending diff --git a/sbt-app/src/sbt-test/project/provided/build.sbt b/sbt-app/src/sbt-test/project/provided/build.sbt index 49a4c3edb..f40f3a81d 100644 --- a/sbt-app/src/sbt-test/project/provided/build.sbt +++ b/sbt-app/src/sbt-test/project/provided/build.sbt @@ -1,10 +1,10 @@ val rootRef = LocalProject("root") val sub = project -val superRoot = project in file("super") dependsOn rootRef +val superRoot = (project in file("super")).dependsOn(rootRef) -val root = (project in file(".")). - dependsOn(sub % "provided->test"). - settings ( +lazy val root = (project in file(".")) + .dependsOn(sub % "provided->test") + .settings( TaskKey[Unit]("check") := { check0((sub / Test / fullClasspath).value, "sub test", true) check0((superRoot / Compile / fullClasspath).value, "superRoot main", false) @@ -14,16 +14,14 @@ val root = (project in file(".")). } ) -def check0(cp: Seq[Attributed[File]], label: String, shouldSucceed: Boolean): Unit = { +def check0(cp: Seq[Attributed[File]], label: String, shouldSucceed: Boolean): Unit = import sbt.internal.inc.classpath.ClasspathUtilities val loader = ClasspathUtilities.toLoader(cp.files) println("Checking " + label) - val err = try { Class.forName("org.example.ProvidedTest", false, loader); None } - catch { case e: Exception => Some(e) } - - (err, shouldSucceed) match { + val err = + try { Class.forName("org.example.ProvidedTest", false, loader); None } + catch { case e: Exception => Some(e) } + (err, shouldSucceed) match case (None, true) | (Some(_), false) => () case (None, false) => sys.error("Expected failure") case (Some(x), true) => throw x - } -} diff --git a/sbt-app/src/sbt-test/reporter/nowarn/build.sbt b/sbt-app/src/sbt-test/reporter/nowarn/build.sbt index f60d75926..67fea2acb 100644 --- a/sbt-app/src/sbt-test/reporter/nowarn/build.sbt +++ b/sbt-app/src/sbt-test/reporter/nowarn/build.sbt @@ -1,3 +1,5 @@ +ThisBuild / scalaVersion := "2.12.17" + lazy val sub1 = project lazy val sub2 = project diff --git a/sbt-app/src/sbt-test/reporter/nowarn/sub1/warney.scala b/sbt-app/src/sbt-test/reporter/nowarn/sub1/warney.scala index 5ca688749..753003125 100644 --- a/sbt-app/src/sbt-test/reporter/nowarn/sub1/warney.scala +++ b/sbt-app/src/sbt-test/reporter/nowarn/sub1/warney.scala @@ -1,6 +1,6 @@ object warney { - def foo = { + def foo = { 0 - 0 - } + 0 + } } diff --git a/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt b/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt index 3822f71bd..96ac5d222 100644 --- a/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt +++ b/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt @@ -7,10 +7,12 @@ lazy val assertAbsolutePathConversion = taskKey[Unit]("checks source mappers con lazy val assertVirtualFile = taskKey[Unit]("checks source mappers handle virtual files") lazy val resetMessages = taskKey[Unit]("empties the messages list") +ThisBuild / scalaVersion := "2.12.17" + lazy val root = (project in file(".")) .settings( extraAppenders := { s => Seq(ConsoleAppender(FakePrintWriter)) }, - Compile / compile / compileOptions ~= { old: CompileOptions => + Compile / compile / compileOptions ~= { (old: CompileOptions) => old.withSources(StringVirtualFile("/tmp/A.scala", """object X""") +: old.sources) }, assertEmptySourcePositionMappers := { diff --git a/sbt-app/src/sbt-test/run/classpath/build.sbt b/sbt-app/src/sbt-test/run/classpath/build.sbt index 57556d8bb..acdd81418 100644 --- a/sbt-app/src/sbt-test/run/classpath/build.sbt +++ b/sbt-app/src/sbt-test/run/classpath/build.sbt @@ -1 +1 @@ -externalDependencyClasspath in Runtime += file("conf") \ No newline at end of file +(Runtime / externalDependencyClasspath) += file("conf") \ No newline at end of file diff --git a/sbt-app/src/sbt-test/run/concurrent/build.sbt b/sbt-app/src/sbt-test/run/concurrent/build.sbt index 7cc16dd7d..12ec298a8 100644 --- a/sbt-app/src/sbt-test/run/concurrent/build.sbt +++ b/sbt-app/src/sbt-test/run/concurrent/build.sbt @@ -1,40 +1,40 @@ lazy val runTest = taskKey[Unit]("Run the test applications.") def runTestTask(pre: Def.Initialize[Task[Unit]]) = - runTest := { - val _ = pre.value - val r = (runner in (Compile, run)).value - val cp = (fullClasspath in Compile).value - val main = (mainClass in Compile).value getOrElse sys.error("No main class found") - val args = baseDirectory.value.getAbsolutePath :: Nil - r.run(main, cp.files, args, streams.value.log).get - } + runTest := { + val _ = pre.value + val r = (Compile / run / runner).value + val cp = (Compile / fullClasspath).value + val main = (Compile / mainClass).value getOrElse sys.error("No main class found") + val args = baseDirectory.value.getAbsolutePath :: Nil + r.run(main, cp.files, args, streams.value.log).get + } lazy val b = project.settings( - runTestTask( waitForCStart ), - runTest := { - val _ = runTest.value - val cFinished = (baseDirectory in c).value / "finished" - assert( !cFinished.exists, "C finished before B") - IO.touch(baseDirectory.value / "finished") - } + runTestTask( waitForCStart ), + runTest := { + val _ = runTest.value + val cFinished = (c / baseDirectory).value / "finished" + assert( !cFinished.exists, "C finished before B") + IO.touch(baseDirectory.value / "finished") + } ) -lazy val c = project.settings( runTestTask( Def.task() ) ) +lazy val c = project.settings( runTestTask( Def.task(()) ) ) // need at least 2 concurrently executing tasks to proceed -concurrentRestrictions in Global := Seq( - Tags.limitAll(math.max(EvaluateTask.SystemProcessors, 2) ) +(Global / concurrentRestrictions) := Seq( + Tags.limitAll(math.max(EvaluateTask.SystemProcessors, 2) ) ) def waitForCStart = - Def.task { - waitFor( (baseDirectory in c).value / "started" ) - } + Def.task { + waitFor( (c / baseDirectory).value / "started" ) + } def waitFor(f: File): Unit = { - if(!f.exists) { - Thread.sleep(300) - waitFor(f) - } + if(!f.exists) { + Thread.sleep(300) + waitFor(f) + } } diff --git a/sbt-app/src/sbt-test/run/concurrent/changes/B.scala b/sbt-app/src/sbt-test/run/concurrent/changes/B.scala index 8527ab04f..2cc992119 100644 --- a/sbt-app/src/sbt-test/run/concurrent/changes/B.scala +++ b/sbt-app/src/sbt-test/run/concurrent/changes/B.scala @@ -1,7 +1,7 @@ import java.io.File object B { - def main(args: Array[String]) { - Thread.sleep(1000) - } -} \ No newline at end of file + def main(args: Array[String]): Unit = { + Thread.sleep(1000) + } +} diff --git a/sbt-app/src/sbt-test/run/daemon/src/main/scala/Daemon.scala b/sbt-app/src/sbt-test/run/daemon/src/main/scala/Daemon.scala index 5f0563445..42c1a4488 100644 --- a/sbt-app/src/sbt-test/run/daemon/src/main/scala/Daemon.scala +++ b/sbt-app/src/sbt-test/run/daemon/src/main/scala/Daemon.scala @@ -1,11 +1,9 @@ -object Daemon -{ - def main(args: Array[String]) - { - val t = new Thread { - override def run(): Unit = synchronized { wait() } - } - t.setDaemon(true); - t.start - } +object Daemon { + def main(args: Array[String]): Unit = { + val t = new Thread { + override def run(): Unit = synchronized { wait() } + } + t.setDaemon(true); + t.start + } } diff --git a/sbt-app/src/sbt-test/run/fork-loader/test b/sbt-app/src/sbt-test/run/fork-loader/pending similarity index 100% rename from sbt-app/src/sbt-test/run/fork-loader/test rename to sbt-app/src/sbt-test/run/fork-loader/pending diff --git a/sbt-app/src/sbt-test/run/non-local-main/build.sbt b/sbt-app/src/sbt-test/run/non-local-main/build.sbt index 0010f0c27..d7f046b6e 100644 --- a/sbt-app/src/sbt-test/run/non-local-main/build.sbt +++ b/sbt-app/src/sbt-test/run/non-local-main/build.sbt @@ -1,5 +1,3 @@ - - lazy val main = project.settings( organization := "org.scala-sbt.testsuite.example", name := "has-main", @@ -8,15 +6,14 @@ lazy val main = project.settings( lazy val user = project.settings( fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), - libraryDependencies += (projectID in main).value, - mainClass in Compile := Some("Test") + libraryDependencies += (main / projectID).value, + (Compile / mainClass) := Some("Test") ) // NOTE - This will NOT work, as mainClass must be scoped by Compile (and optionally task) to function correctly). lazy val user2 = project.settings( fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project"), - libraryDependencies += (projectID in main).value, + libraryDependencies += (main / projectID).value, mainClass := Some("Test") ) - diff --git a/sbt-app/src/sbt-test/run/non-local-main/test b/sbt-app/src/sbt-test/run/non-local-main/pending similarity index 100% rename from sbt-app/src/sbt-test/run/non-local-main/test rename to sbt-app/src/sbt-test/run/non-local-main/pending diff --git a/sbt-app/src/sbt-test/run/spawn-exit/test b/sbt-app/src/sbt-test/run/spawn-exit/disabled similarity index 100% rename from sbt-app/src/sbt-test/run/spawn-exit/test rename to sbt-app/src/sbt-test/run/spawn-exit/disabled diff --git a/sbt-app/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala b/sbt-app/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala index 766ed2955..385fb40b2 100644 --- a/sbt-app/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala +++ b/sbt-app/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala @@ -4,27 +4,23 @@ // This thread waits another second before calling System.exit. The first thread hangs around to // ensure that TrapExit actually processes the exit. -object Spawn -{ - def main(args: Array[String]) - { - (new ThreadA).start - } - class ThreadA extends Thread - { - override def run() - { - Thread.sleep(1000) - (new ThreadB).start() - synchronized { wait() } - } - } - class ThreadB extends Thread - { - override def run() - { - Thread.sleep(1000) - System.exit(0) - } - } -} \ No newline at end of file +object Spawn { + def main(args: Array[String]): Unit = { + (new ThreadA).start + } + + class ThreadA extends Thread { + override def run(): Unit = { + Thread.sleep(1000) + (new ThreadB).start() + synchronized { wait() } + } + } + + class ThreadB extends Thread { + override def run(): Unit = { + Thread.sleep(1000) + System.exit(0) + } + } +} diff --git a/sbt-app/src/sbt-test/source-dependencies/abstract-type-override/build.sbt b/sbt-app/src/sbt-test/source-dependencies/abstract-type-override/build.sbt index 1036709cc..3888dda98 100644 --- a/sbt-app/src/sbt-test/source-dependencies/abstract-type-override/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/abstract-type-override/build.sbt @@ -6,7 +6,7 @@ val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") recordPreviousIterations := { val log = streams.value.log CompileState.previousIterations = { - val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + val previousAnalysis = (Compile / previousCompile).value.analysis.asScala previousAnalysis match { case None => log.info("No previous analysis detected") @@ -20,6 +20,6 @@ val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterati checkIterations := { val expected: Int = (Space ~> NatBasic).parsed - val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + val actual: Int = ((Compile / compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations assert(expected == actual, s"Expected $expected compilations, got $actual") } diff --git a/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt b/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt index 9298a3b66..09dea40d0 100644 --- a/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt @@ -4,5 +4,5 @@ lazy val dep = project lazy val use = project. settings( - unmanagedJars in Compile += (packageBin in (dep, Compile) map Attributed.blank).value + (Compile / unmanagedJars) += ((dep / Compile / packageBin) map Attributed.blank).value ) diff --git a/sbt-app/src/sbt-test/source-dependencies/canon/build.sbt b/sbt-app/src/sbt-test/source-dependencies/canon/build.sbt index 1036709cc..3888dda98 100644 --- a/sbt-app/src/sbt-test/source-dependencies/canon/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/canon/build.sbt @@ -6,7 +6,7 @@ val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") recordPreviousIterations := { val log = streams.value.log CompileState.previousIterations = { - val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + val previousAnalysis = (Compile / previousCompile).value.analysis.asScala previousAnalysis match { case None => log.info("No previous analysis detected") @@ -20,6 +20,6 @@ val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterati checkIterations := { val expected: Int = (Space ~> NatBasic).parsed - val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + val actual: Int = ((Compile / compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations assert(expected == actual, s"Expected $expected compilations, got $actual") } diff --git a/sbt-app/src/sbt-test/source-dependencies/compactify/build.sbt b/sbt-app/src/sbt-test/source-dependencies/compactify/build.sbt index 8ab6d08a2..d6e89fe63 100644 --- a/sbt-app/src/sbt-test/source-dependencies/compactify/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/compactify/build.sbt @@ -1,6 +1,6 @@ -TaskKey[Unit]("outputEmpty") := (classDirectory in Configurations.Compile map { outputDirectory => - def classes = (outputDirectory ** "*.class").get - if(!classes.isEmpty) sys.error("Classes existed:\n\t" + classes.mkString("\n\t")) else () +TaskKey[Unit]("outputEmpty") := ((Configurations.Compile / classDirectory) map { outputDirectory => + def classes = (outputDirectory ** "*.class").get() + if (!classes.isEmpty) sys.error("Classes existed:\n\t" + classes.mkString("\n\t")) else () }).value // apparently Travis CI stopped allowing long file names diff --git a/sbt-app/src/sbt-test/source-dependencies/implicit-params/build.sbt b/sbt-app/src/sbt-test/source-dependencies/implicit-params/build.sbt new file mode 100644 index 000000000..07fe33830 --- /dev/null +++ b/sbt-app/src/sbt-test/source-dependencies/implicit-params/build.sbt @@ -0,0 +1,2 @@ +ThisBuild / scalaVersion := "2.12.17" + diff --git a/sbt-app/src/sbt-test/source-dependencies/implicit-search/build.sbt b/sbt-app/src/sbt-test/source-dependencies/implicit-search/build.sbt new file mode 100644 index 000000000..07fe33830 --- /dev/null +++ b/sbt-app/src/sbt-test/source-dependencies/implicit-search/build.sbt @@ -0,0 +1,2 @@ +ThisBuild / scalaVersion := "2.12.17" + diff --git a/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt index 3f976bc4f..232ebc4aa 100644 --- a/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt @@ -1,8 +1,10 @@ import sbt.internal.inc.Analysis name := "test" +ThisBuild / scalaVersion := "2.12.17" -TaskKey[Unit]("checkSame") := (compile in Configurations.Compile map { case analysis: Analysis => - analysis.apis.internal foreach { case (_, api) => - assert( xsbt.api.SameAPI(api.api, api.api) ) - } +TaskKey[Unit]("checkSame") := ((Configurations.Compile / compile) map { + case analysis: Analysis => + analysis.apis.internal foreach { case (_, api) => + assert( xsbt.api.SameAPI(api.api, api.api) ) + } }).value diff --git a/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt b/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt index ae85d25a6..0db8723f6 100644 --- a/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt @@ -6,28 +6,28 @@ val commonSettings = Seq( scalacOptions ++= Seq(""), resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("releases"), - addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full) + addCompilerPlugin(("org.scalamacros" % "paradise" % paradiseVersion).cross(CrossVersion.full)), ) -lazy val root = (project in file(".")). - aggregate(macros, core). - settings( +lazy val root = (project in file(".")) + .aggregate(macros, core) + .settings( commonSettings, - run := (run in Compile in core).evaluated + run := (core / Compile / run).evaluated, ) -lazy val macros = (project in file("macros")). - settings( +lazy val macros = (project in file("macros")) + .settings( commonSettings, libraryDependencies += (scalaVersion)("org.scala-lang" % "scala-reflect" % _).value, libraryDependencies ++= ( if (scalaVersion.value.startsWith("2.10")) List("org.scalamacros" %% "quasiquotes" % paradiseVersion) else Nil - ) + ), ) -lazy val core = (project in file("core")). - dependsOn(macros). - settings( - commonSettings +lazy val core = (project in file("core")) + .dependsOn(macros) + .settings( + commonSettings, ) diff --git a/sbt-app/src/sbt-test/source-dependencies/replace-test-a/build.sbt b/sbt-app/src/sbt-test/source-dependencies/replace-test-a/build.sbt index 26e149cbe..35547df68 100644 --- a/sbt-app/src/sbt-test/source-dependencies/replace-test-a/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/replace-test-a/build.sbt @@ -7,7 +7,7 @@ lazy val root = (project in file(".")). ) def checkTask(className: String) = - fullClasspath in Configurations.Runtime map { runClasspath => + (Configurations.Runtime / fullClasspath) map { runClasspath => val cp = runClasspath.map(_.data.toURI.toURL).toArray Class.forName(className, false, new URLClassLoader(cp)) () diff --git a/sbt-app/src/sbt-test/source-dependencies/restore-classes/build.sbt b/sbt-app/src/sbt-test/source-dependencies/restore-classes/build.sbt index e0254391f..cf56984fa 100644 --- a/sbt-app/src/sbt-test/source-dependencies/restore-classes/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/restore-classes/build.sbt @@ -1,14 +1,14 @@ import sbt.internal.inc.Analysis import complete.DefaultParsers._ -crossTarget in Compile := target.value +(Compile / crossTarget) := target.value // Reset compiler iterations, necessary because tests run in batch mode val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") recordPreviousIterations := { val log = streams.value.log CompileState.previousIterations = { - val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + val previousAnalysis = (Compile / previousCompile).value.analysis.asScala previousAnalysis match { case None => log.info("No previous analysis detected") @@ -23,6 +23,6 @@ val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterati checkIterations := { val expected: Int = (Space ~> NatBasic).parsed - val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + val actual: Int = ((Compile / compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations assert(expected == actual, s"Expected $expected compilations, got $actual") } diff --git a/sbt-app/src/sbt-test/source-dependencies/struct-usage/build.sbt b/sbt-app/src/sbt-test/source-dependencies/struct-usage/build.sbt new file mode 100644 index 000000000..07fe33830 --- /dev/null +++ b/sbt-app/src/sbt-test/source-dependencies/struct-usage/build.sbt @@ -0,0 +1,2 @@ +ThisBuild / scalaVersion := "2.12.17" + diff --git a/sbt-app/src/sbt-test/source-dependencies/struct/B.scala b/sbt-app/src/sbt-test/source-dependencies/struct/B.scala index 635568727..724be2fef 100644 --- a/sbt-app/src/sbt-test/source-dependencies/struct/B.scala +++ b/sbt-app/src/sbt-test/source-dependencies/struct/B.scala @@ -1,4 +1,4 @@ object B { - def onX(m: { def x: Int } ) = - m.x -} \ No newline at end of file + def onX(m: { def x: Int } ) = + m.x +} diff --git a/sbt-app/src/sbt-test/source-dependencies/struct/build.sbt b/sbt-app/src/sbt-test/source-dependencies/struct/build.sbt new file mode 100644 index 000000000..07fe33830 --- /dev/null +++ b/sbt-app/src/sbt-test/source-dependencies/struct/build.sbt @@ -0,0 +1,2 @@ +ThisBuild / scalaVersion := "2.12.17" + diff --git a/sbt-app/src/sbt-test/source-dependencies/trait-member-modified/build.sbt b/sbt-app/src/sbt-test/source-dependencies/trait-member-modified/build.sbt index d951aaaf5..d095d9c32 100644 --- a/sbt-app/src/sbt-test/source-dependencies/trait-member-modified/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/trait-member-modified/build.sbt @@ -3,8 +3,8 @@ import sbt.internal.inc.Analysis import xsbti.compile.{PreviousResult, CompileAnalysis, MiniSetup} import xsbti.compile.analysis.{ Compilation => XCompilation } -previousCompile in Compile := { - val previous = (previousCompile in Compile).value +(Compile / previousCompile) := { + val previous = (Compile / previousCompile).value if (!CompileState.isNew) { val res = PreviousResult.of(none[CompileAnalysis].asJava, none[MiniSetup].asJava) CompileState.isNew = true @@ -17,13 +17,13 @@ previousCompile in Compile := { * b) checks overall number of compilations performed */ TaskKey[Unit]("checkCompilations") := { - val analysis = (compile in Compile).value match { case a: Analysis => a } - val srcDir = (scalaSource in Compile).value + val analysis = (Compile / compile).value match { case a: Analysis => a } + val srcDir = (Compile / scalaSource).value def findFile(className: String): VirtualFileRef = { analysis.relations.definesClass(className).head } val allCompilations = analysis.compilations.allCompilations - val recompiledFiles: Seq[Set[VirtualFileRef]] = allCompilations map { c: XCompilation => + val recompiledFiles: Seq[Set[VirtualFileRef]] = allCompilations map { (c: XCompilation) => val recompiledFiles = analysis.apis.internal.collect { case (cn, api) if api.compilationTimestamp == c.getStartTime => findFile(cn) } diff --git a/sbt-app/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt-app/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt index 9124b2590..868664c24 100644 --- a/sbt-app/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt @@ -7,8 +7,8 @@ import xsbti.compile.analysis.{ Compilation => XCompilation } logLevel := Level.Debug // Reset compile status because scripted tests are run in batch mode -previousCompile in Compile := { - val previous = (previousCompile in Compile).value +(Compile / previousCompile) := { + val previous = (Compile / previousCompile).value if (!CompileState.isNew) { val res = PreviousResult.of(none[CompileAnalysis].asJava, none[MiniSetup].asJava) CompileState.isNew = true @@ -36,14 +36,14 @@ TaskKey[Unit]("checkCompilations") := { } // log.info(vs.mkString(",")) - val analysis = (compile in Compile).value match { case a: Analysis => a } - val srcDir = (scalaSource in Compile).value + val analysis = (Compile / compile).value match { case a: Analysis => a } + val srcDir = (Compile / scalaSource).value def findFile(className: String): VirtualFileRef = { analysis.relations.definesClass(className).head } val allCompilations: Seq[XCompilation] = analysis.compilations.allCompilations log.info(s"allCompilations: $allCompilations") - val recompiledFiles: Seq[Set[VirtualFileRef]] = allCompilations map { c: XCompilation => + val recompiledFiles: Seq[Set[VirtualFileRef]] = allCompilations map { (c: XCompilation) => val recompiledFiles = analysis.apis.internal.collect { case (cn, api) if api.compilationTimestamp == c.getStartTime => findFile(cn) } diff --git a/sbt-app/src/sbt-test/source-dependencies/type-alias/build.sbt b/sbt-app/src/sbt-test/source-dependencies/type-alias/build.sbt index 00edfde1d..1dfc24400 100644 --- a/sbt-app/src/sbt-test/source-dependencies/type-alias/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/type-alias/build.sbt @@ -1 +1 @@ -logLevel in compile := Level.Debug +(compile / logLevel) := Level.Debug diff --git a/sbt-app/src/sbt-test/tests/junit-xml-report/test b/sbt-app/src/sbt-test/tests/junit-xml-report/test index f76a142c9..370227892 100644 --- a/sbt-app/src/sbt-test/tests/junit-xml-report/test +++ b/sbt-app/src/sbt-test/tests/junit-xml-report/test @@ -6,6 +6,6 @@ > clean > checkNoReport -> set fork in Test := true +> set Test / fork := true -> test > checkReport \ No newline at end of file diff --git a/sbt-app/src/sbt-test/tests/one-class-multi-framework/test b/sbt-app/src/sbt-test/tests/one-class-multi-framework/test index 2f6f758e7..b59faca9e 100644 --- a/sbt-app/src/sbt-test/tests/one-class-multi-framework/test +++ b/sbt-app/src/sbt-test/tests/one-class-multi-framework/test @@ -8,5 +8,5 @@ $ touch succeed > test # also run with forked tests -> set fork in Test := true +> set Test / fork := true > test diff --git a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt index 7dcf87b1e..6dde312bb 100644 --- a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt +++ b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt @@ -11,11 +11,11 @@ lazy val root = (project in file(".")) libraryDependencies += { "org.scala-lang" % "scala-compiler" % scalaVersion.value % OtherScala.name }, - managedClasspath in OtherScala := Classpaths.managedJars(OtherScala, classpathTypes.value, update.value), + OtherScala / managedClasspath := Classpaths.managedJars(OtherScala, classpathTypes.value, update.value), // Hack in the scala instance scalaInstance := { - val rawJars = (managedClasspath in OtherScala).value.map(_.data) + val rawJars = (OtherScala / managedClasspath).value.map(_.data) val scalaHome = (target.value / "scala-home") def removeVersion(name: String): String = name.replaceAll("\\-2.12.11", "") diff --git a/sbt-app/src/sbt-test/tests/scala-instance-classloader/test b/sbt-app/src/sbt-test/tests/scala-instance-classloader/pending similarity index 100% rename from sbt-app/src/sbt-test/tests/scala-instance-classloader/test rename to sbt-app/src/sbt-test/tests/scala-instance-classloader/pending diff --git a/sbt-app/src/sbt-test/tests/serial/test b/sbt-app/src/sbt-test/tests/serial/pending similarity index 100% rename from sbt-app/src/sbt-test/tests/serial/test rename to sbt-app/src/sbt-test/tests/serial/pending diff --git a/sbt-app/src/sbt-test/tests/setup-cleanup/changes/fork.sbt b/sbt-app/src/sbt-test/tests/setup-cleanup/changes/fork.sbt index dfdf7b740..1a4fe3457 100644 --- a/sbt-app/src/sbt-test/tests/setup-cleanup/changes/fork.sbt +++ b/sbt-app/src/sbt-test/tests/setup-cleanup/changes/fork.sbt @@ -1 +1 @@ -fork in Test := true \ No newline at end of file +Test / fork := true \ No newline at end of file diff --git a/sbt-app/src/sbt-test/tests/setup-cleanup/changes/setup.sbt b/sbt-app/src/sbt-test/tests/setup-cleanup/changes/setup.sbt index 5b3634567..1b892891d 100644 --- a/sbt-app/src/sbt-test/tests/setup-cleanup/changes/setup.sbt +++ b/sbt-app/src/sbt-test/tests/setup-cleanup/changes/setup.sbt @@ -1,16 +1,16 @@ -testOptions in Test += { +Test / testOptions += { val baseDir = baseDirectory.value - Tests.Setup { () => - IO.touch(baseDir / "setup") - } + Tests.Setup { () => + IO.touch(baseDir / "setup") + } } -testOptions in Test += { - val t = baseDirectory.value / "tested" - val c = baseDirectory.value / "cleanup" - Tests.Cleanup { () => - assert(t.exists, "Didn't exist: " + t.getAbsolutePath) - IO.delete(t) - IO.touch(c) - } +Test / testOptions += { + val t = baseDirectory.value / "tested" + val c = baseDirectory.value / "cleanup" + Tests.Cleanup { () => + assert(t.exists, "Didn't exist: " + t.getAbsolutePath) + IO.delete(t) + IO.touch(c) + } } diff --git a/sbt-app/src/sbt-test/tests/source-directory-name/test b/sbt-app/src/sbt-test/tests/source-directory-name/test index 9fc35bcff..49be54930 100644 --- a/sbt-app/src/sbt-test/tests/source-directory-name/test +++ b/sbt-app/src/sbt-test/tests/source-directory-name/test @@ -1,2 +1,3 @@ +> ++2.12.17! > compile $ exists target/scala-2.12/classes/ch/epfl/scala/Client.class