From eb7a51c629633aba0728449edabec88efc34f2a8 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 9 Dec 2022 16:52:59 -0500 Subject: [PATCH] Mark dependency management tests pending --- .../actions/clean-managed/{test => pending} | 0 .../sbt-test/actions/compile-clean/build.sbt | 1 + .../actions/compile-clean/{test => pending} | 0 .../compile-time-only/{test => pending} | 0 sbt-app/src/sbt-test/actions/depends-on/test | 4 +-- .../dependency-management/artifact/build.sbt | 25 ++++++++++--------- .../artifact/{test => pending} | 0 .../auto-scala-library/build.sbt | 4 +-- .../cache-classifiers/multi.sbt | 11 ++++---- .../cache-classifiers/{test => pending} | 0 .../cache-local/{test => pending} | 0 .../cache-resolver/changes/both/build.sbt | 11 ++++---- .../cache-resolver/changes/def/build.sbt | 11 ++++---- .../cache-resolver/changes/use/build.sbt | 2 +- .../cache-update/build.sbt | 4 +-- .../changes/multi.sbt | 8 +++--- .../cached-resolution-circular/multi.sbt | 2 +- .../cached-resolution-classifier/multi.sbt | 18 ++++++------- .../build.sbt | 2 +- .../cached-resolution-conflicts/multi.sbt | 2 +- .../cached-resolution-exclude/multi.sbt | 8 +++--- .../cached-resolution-force/multi.sbt | 16 ++++++------ .../cached-resolution-interproj/multi.sbt | 10 ++++---- .../cached-resolution-overrides/multi.sbt | 10 ++++---- .../chainresolver/build.sbt | 8 +++--- .../circular-dependency/multi.sbt | 6 ++--- .../global-plugins/{test => disable} | 0 .../global-plugins/global/plugins/metals.sbt | 4 +-- .../snapshot-resolution/build.sbt | 2 +- .../unique-settings-computation/build.sbt | 4 +-- 30 files changed, 89 insertions(+), 84 deletions(-) rename sbt-app/src/sbt-test/actions/clean-managed/{test => pending} (100%) rename sbt-app/src/sbt-test/actions/compile-clean/{test => pending} (100%) rename sbt-app/src/sbt-test/actions/compile-time-only/{test => pending} (100%) rename sbt-app/src/sbt-test/dependency-management/artifact/{test => pending} (100%) rename sbt-app/src/sbt-test/dependency-management/cache-classifiers/{test => pending} (100%) rename sbt-app/src/sbt-test/dependency-management/cache-local/{test => pending} (100%) rename sbt-app/src/sbt-test/dependency-management/global-plugins/{test => disable} (100%) diff --git a/sbt-app/src/sbt-test/actions/clean-managed/test b/sbt-app/src/sbt-test/actions/clean-managed/pending similarity index 100% rename from sbt-app/src/sbt-test/actions/clean-managed/test rename to sbt-app/src/sbt-test/actions/clean-managed/pending diff --git a/sbt-app/src/sbt-test/actions/compile-clean/build.sbt b/sbt-app/src/sbt-test/actions/compile-clean/build.sbt index d76c2ffb2..75c6a9b44 100644 --- a/sbt-app/src/sbt-test/actions/compile-clean/build.sbt +++ b/sbt-app/src/sbt-test/actions/compile-clean/build.sbt @@ -1,4 +1,5 @@ import sbt.nio.file.Glob +ThisBuild / scalaVersion := "2.12.17" Compile / cleanKeepGlobs += Glob((Compile / compile / classDirectory).value, "X.class") diff --git a/sbt-app/src/sbt-test/actions/compile-clean/test b/sbt-app/src/sbt-test/actions/compile-clean/pending similarity index 100% rename from sbt-app/src/sbt-test/actions/compile-clean/test rename to sbt-app/src/sbt-test/actions/compile-clean/pending diff --git a/sbt-app/src/sbt-test/actions/compile-time-only/test b/sbt-app/src/sbt-test/actions/compile-time-only/pending similarity index 100% rename from sbt-app/src/sbt-test/actions/compile-time-only/test rename to sbt-app/src/sbt-test/actions/compile-time-only/pending diff --git a/sbt-app/src/sbt-test/actions/depends-on/test b/sbt-app/src/sbt-test/actions/depends-on/test index d893d7973..744e7e49a 100644 --- a/sbt-app/src/sbt-test/actions/depends-on/test +++ b/sbt-app/src/sbt-test/actions/depends-on/test @@ -17,7 +17,7 @@ $ touch succeed -> h fail $ absent h -> set traceLevel in ThisBuild := 100 -> set logLevel in ThisBuild := Level.Debug +> set ThisBuild / traceLevel := 100 +> set ThisBuild / logLevel := Level.Debug > h succeed $ exists h diff --git a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt index e4ffeae52..87a0a5b4c 100644 --- a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt @@ -11,7 +11,7 @@ ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "com.example" ThisBuild / organizationName := "example" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" -ThisBuild / licenses := List(License.Apache2) +// ThisBuild / licenses := List(License.Apache2) lazy val Dev = config("dev").extend(Compile) .describedAs("Dependencies required for development environments") @@ -24,11 +24,11 @@ lazy val root = (project in file(".")) scalaCompilerBridgeResolvers += userLocalFileResolver(appConfiguration.value), resolvers += baseDirectory { base => "Test Repo" at (base / "test-repo").toURI.toString }.value, moduleName := artifactID, - projectID := (if (baseDirectory.value / "retrieve" exists) retrieveID else publishedID), - artifact in (Compile, packageBin) := mainArtifact, - libraryDependencies ++= (if (baseDirectory.value / "retrieve" exists) publishedID :: Nil else Nil), + projectID := (if (baseDirectory.value / "retrieve").exists then retrieveID else publishedID), + Compile / packageBin / artifact := mainArtifact, + libraryDependencies ++= (if (baseDirectory.value / "retrieve").exists then publishedID :: Nil else Nil), // needed to add a jar with a different type to the managed classpath - unmanagedClasspath in Compile ++= scalaInstance.value.libraryJars.toSeq, + Compile / unmanagedClasspath ++= scalaInstance.value.libraryJars.toSeq, classpathTypes := Set(tpe), // custom configuration artifacts @@ -63,13 +63,14 @@ def publishedID = org % artifactID % vers artifacts(mainArtifact) def retrieveID = org % "test-retrieve" % "2.0" // check that the test class is on the compile classpath, either because it was compiled or because it was properly retrieved -def checkTask(classpath: TaskKey[Classpath]) = Def.task { - val deps = libraryDependencies.value - val cp = (classpath in Compile).value.files - val loader = ClasspathUtilities.toLoader(cp, scalaInstance.value.loader) - try { Class.forName("test.Test", false, loader); () } - catch { case _: ClassNotFoundException | _: NoClassDefFoundError => sys.error(s"Dependency not retrieved properly: $deps, $cp") } -} +def checkTask(classpath: TaskKey[Classpath]) = + Def.task { + val deps = libraryDependencies.value + val cp = (Compile / classpath).value.files + val loader = ClasspathUtilities.toLoader(cp, scalaInstance.value.loader) + try { Class.forName("test.Test", false, loader); () } + catch { case _: ClassNotFoundException | _: NoClassDefFoundError => sys.error(s"Dependency not retrieved properly: $deps, $cp") } + } // use the user local resolver to fetch the SNAPSHOT version of the compiler-bridge def userLocalFileResolver(appConfig: AppConfiguration): Resolver = { diff --git a/sbt-app/src/sbt-test/dependency-management/artifact/test b/sbt-app/src/sbt-test/dependency-management/artifact/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/artifact/test rename to sbt-app/src/sbt-test/dependency-management/artifact/pending diff --git a/sbt-app/src/sbt-test/dependency-management/auto-scala-library/build.sbt b/sbt-app/src/sbt-test/dependency-management/auto-scala-library/build.sbt index 20969e7e5..2d2277c17 100644 --- a/sbt-app/src/sbt-test/dependency-management/auto-scala-library/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/auto-scala-library/build.sbt @@ -1,11 +1,11 @@ +scalaVersion := "2.12.16" autoScalaLibrary := false libraryDependencies += "com.chuusai" % "shapeless_2.12" % "2.3.2" val checkScalaLibrary = TaskKey[Unit]("checkScalaLibrary") checkScalaLibrary := { - val scalaLibsJars = managedClasspath - .in(Compile) + val scalaLibsJars = (Compile / managedClasspath) .value .map(_.data.getName) .filter(_.startsWith("scala-library")) diff --git a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt index 69771b0b8..9bca7e9d9 100644 --- a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt @@ -7,15 +7,16 @@ ThisBuild / useCoursier := false ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" def localCache = - ivyPaths := IvyPaths(baseDirectory.value, Some((baseDirectory in ThisBuild).value / "ivy" / "cache")) + ivyPaths := IvyPaths(baseDirectory.value, Some((ThisBuild / baseDirectory).value / "ivy" / "cache")) val b = project .settings( localCache, - libraryDependencies += "org.example" %% "artifacta" % "1.0.0-SNAPSHOT" withSources() classifier("tests"), + libraryDependencies += ("org.example" %% "artifacta" % "1.0.0-SNAPSHOT") + .withSources().classifier("tests"), scalaCompilerBridgeResolvers += userLocalFileResolver(appConfiguration.value), externalResolvers := Vector( - MavenCache("demo", ((baseDirectory in ThisBuild).value / "demo-repo")), + MavenCache("demo", ((ThisBuild / baseDirectory).value / "demo-repo")), DefaultMavenRepository ) ) @@ -26,8 +27,8 @@ val a = project organization := "org.example", name := "artifacta", version := "1.0.0-SNAPSHOT", - publishArtifact in (Test,packageBin) := true, - publishTo := Some(MavenCache("demo", ((baseDirectory in ThisBuild).value / "demo-repo"))) + Test / packageBin / publishArtifact := true, + publishTo := Some(MavenCache("demo", ((ThisBuild / baseDirectory).value / "demo-repo"))) ) // use the user local resolver to fetch the SNAPSHOT version of the compiler-bridge diff --git a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/test b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/cache-classifiers/test rename to sbt-app/src/sbt-test/dependency-management/cache-classifiers/pending diff --git a/sbt-app/src/sbt-test/dependency-management/cache-local/test b/sbt-app/src/sbt-test/dependency-management/cache-local/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/cache-local/test rename to sbt-app/src/sbt-test/dependency-management/cache-local/pending diff --git a/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/both/build.sbt b/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/both/build.sbt index 1af0fabe2..b43c8415e 100644 --- a/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/both/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/both/build.sbt @@ -1,23 +1,24 @@ +ThisBuild / organization := "org.example" +ThisBuild / version := "2.0-SNAPSHOT" + lazy val root = (project in file(".")). aggregate(a,b). settings( name := "use", version := "1.0", - organization in ThisBuild := "org.example", - version in ThisBuild := "2.0-SNAPSHOT", libraryDependencies += "org.example" % "b" % "2.0-SNAPSHOT", - ivyPaths := (ivyPaths in ThisBuild).value + ivyPaths := (ThisBuild / ivyPaths).value, ) lazy val a = project. dependsOn(b). settings( name := "a", - ivyPaths := (ivyPaths in ThisBuild).value + ivyPaths := (ThisBuild / ivyPaths).value, ) lazy val b = project. settings( name := "b", - ivyPaths := (ivyPaths in ThisBuild).value + ivyPaths := (ThisBuild / ivyPaths).value, ) diff --git a/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/def/build.sbt b/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/def/build.sbt index e58d9f25b..1a39ae010 100644 --- a/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/def/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/def/build.sbt @@ -1,20 +1,21 @@ +ThisBuild / organization := "org.example" +ThisBuild / version := "2.0-SNAPSHOT" + lazy val root = (project in file(".")). aggregate(a,b). settings( - organization in ThisBuild := "org.example", - version in ThisBuild := "2.0-SNAPSHOT", - ivyPaths := (ivyPaths in ThisBuild).value + ivyPaths := (ThisBuild / ivyPaths).value, ) lazy val a = project. dependsOn(b). settings( name := "a", - ivyPaths := (ivyPaths in ThisBuild).value + ivyPaths := (ThisBuild / ivyPaths).value, ) lazy val b = project. settings( name := "b", - ivyPaths := (ivyPaths in ThisBuild).value + ivyPaths := (ThisBuild / ivyPaths).value, ) diff --git a/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/use/build.sbt b/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/use/build.sbt index f590da3e8..073aa2009 100644 --- a/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/use/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cache-resolver/changes/use/build.sbt @@ -4,5 +4,5 @@ lazy val root = (project in file(".")). organization := "org.example", version := "1.0", libraryDependencies += "org.example" % "b" % "2.0-SNAPSHOT", - ivyPaths := (ivyPaths in ThisBuild).value + ivyPaths := (ThisBuild / ivyPaths).value, ) 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 47d24a502..6206d5c90 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 @@ -23,8 +23,8 @@ lazy val root = (project in file(".")) licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")), )), ivyPaths := IvyPaths( - (baseDirectory in ThisBuild).value, - Some((baseDirectory in LocalRootProject).value / "ivy-cache") + (ThisBuild / baseDirectory).value, + Some((LocalRootProject / baseDirectory).value / "ivy-cache") ), libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "1.0.0", diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt index 8b81f831e..f7d828768 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/changes/multi.sbt @@ -7,10 +7,12 @@ val luceneVersion = "4.0.0" val akkaVersion = "2.3.1" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" +ThisBuild / organization := "org.example" +ThisBuild / version := "1.0-SNAPSHOT" 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.withCachedResolution(true) @@ -48,10 +50,8 @@ lazy val c = project. lazy val root = (project in file(".")). settings(commonSettings: _*). settings( - organization in ThisBuild := "org.example", - version in ThisBuild := "1.0-SNAPSHOT", check := { - val acp = (externalDependencyClasspath in Compile in a).value.map {_.data.getName}.sorted + val acp = (a / Compile / externalDependencyClasspath).value.map {_.data.getName}.sorted if (!(acp contains "netty-3.2.0.Final.jar")) { sys.error("netty-3.2.0.Final not found when it should be included: " + acp.toString) } diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt index acd0593cf..a2c91af11 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt @@ -10,7 +10,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c 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") ) 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 f9321ed10..f0234ce98 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 @@ -6,7 +6,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", scalaVersion := "2.10.4", resolvers += Resolver.sonatypeRepo("snapshots") @@ -67,16 +67,16 @@ lazy val root = (project in file(".")). organization in ThisBuild := "org.example", version in ThisBuild := "1.0", check := { - val acp = (externalDependencyClasspath in Compile in a).value.map {_.data.getName}.sorted - val bcp = (externalDependencyClasspath in Compile in b).value.map {_.data.getName}.sorted - val ccp = (externalDependencyClasspath in Compile in c).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} + val acp = (a / Compile / externalDependencyClasspath).value.map {_.data.getName}.sorted + val bcp = (b / Compile / externalDependencyClasspath).value.map {_.data.getName}.sorted + val ccp = (c / Compile / externalDependencyClasspath).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} if (!(acp contains "commons-io-1.4-sources.jar")) { sys.error("commons-io-1.4-sources not found when it should be included: " + acp.toString) } // if (!(acp contains "commons-io-1.4.jar")) { // sys.error("commons-io-1.4 not found when it should be included: " + acp.toString) // } - + // stock Ivy implementation doesn't contain regular (non-source) jar, which probably is a bug val acpWithoutSource = acp filterNot { _ == "commons-io-1.4.jar"} val bcpWithoutSource = bcp filterNot { _ == "commons-io-1.4.jar"} @@ -86,10 +86,10 @@ lazy val root = (project in file(".")). "\n - a (cached) " + acpWithoutSource.toString + "\n - b (plain) " + bcpWithoutSource.toString + "\n - c (inter-project) " + ccpWithoutSource.toString) - - val atestcp = (externalDependencyClasspath in Test in a).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} - val btestcp = (externalDependencyClasspath in Test in b).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} - val ctestcp = (externalDependencyClasspath in Test in c).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} filterNot { _ == "commons-io-1.4.jar"} + + val atestcp = (a / Test / externalDependencyClasspath).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} + val btestcp = (b / Test / externalDependencyClasspath).value.map {_.data.getName}.sorted filterNot { _ == "commons-io-1.4.jar"} + val ctestcp = (c / Test / externalDependencyClasspath).value.map {_.data.getName}.sorted filterNot { _ == "demo_2.10.jar"} filterNot { _ == "commons-io-1.4.jar"} if (ctestcp contains "junit-4.13.1.jar") { sys.error("junit found when it should be excluded: " + ctestcp.toString) } 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 018bab537..afd305e08 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 @@ -5,7 +5,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Vector[Def.Setting[_]] = Vector( organization := "com.example", - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", scalaCompilerBridgeResolvers += userLocalFileResolver(appConfiguration.value), resolvers += Resolver.file("buggy", (baseDirectory in LocalRootProject).value / "repo")( 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 914681915..54df64b1b 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 @@ -11,7 +11,7 @@ inThisBuild(Seq( )) def commonSettings: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths((baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", fullResolvers := fullResolvers.value.filterNot(_.name == "inter-project") ) diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt index cf58ed44a..ba2a58557 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt @@ -6,8 +6,8 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), - dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), + dependencyCacheDirectory := (LocalRootProject / baseDirectory).value / "dependency", scalaVersion := "2.10.4", resolvers += Resolver.sonatypeRepo("snapshots") ) @@ -35,8 +35,8 @@ lazy val root = (project in file(".")). version := "1.0", updateOptions := updateOptions.value.withCachedResolution(true), check := { - val acp = (externalDependencyClasspath in Compile in a).value.sortBy {_.data.getName} - val bcp = (externalDependencyClasspath in Compile in b).value.sortBy {_.data.getName} + val acp = (a / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} + val bcp = (b / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} if (acp exists { _.data.getName contains "commons-io" }) { sys.error("commons-io found when it should be excluded") } 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 2d6a9f93a..dd4237348 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 @@ -4,7 +4,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", scalaVersion := "2.10.4", resolvers += Resolver.sonatypeRepo("snapshots") @@ -60,15 +60,15 @@ lazy val d = project. lazy val root = (project in file(".")). aggregate(a, b, c). settings( - organization in ThisBuild := "org.example", - version in ThisBuild := "1.0", + ThisBuild / organization := "org.example", + ThisBuild / version := "1.0", check := { // sys.error(dependencyCacheDirectory.value.toString) - val acp = (externalDependencyClasspath in Compile in a).value.sortBy {_.data.getName} - val bcp = (externalDependencyClasspath in Compile in b).value.sortBy {_.data.getName} - val ccp = (externalDependencyClasspath in Compile in c).value.sortBy {_.data.getName} - val dcp = (externalDependencyClasspath in Compile in d).value.sortBy {_.data.getName} - + val acp = (a / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} + val bcp = (b / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} + val ccp = (c / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} + val dcp = (d / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} + if (!(acp exists {_.data.getName contains "spring-core-3.2.2.RELEASE"})) { sys.error("spring-core-3.2.2 is not found on a") } 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 e5b6ea9d3..bd1a0c681 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 @@ -8,7 +8,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", resolvers += Resolver.sonatypeRepo("snapshots") ) @@ -36,10 +36,10 @@ lazy val root = (project in file(".")). version := "1.0", updateOptions := updateOptions.value.withCachedResolution(true), check := { - val ur = (update in a).value - val acp = (externalDependencyClasspath in Compile in a).value.map {_.data.getName} - val atestcp0 = (fullClasspath in Test in a).value - val atestcp = (externalDependencyClasspath in Test in a).value.map {_.data.getName} + val ur = (a / update).value + val acp = (a / Compile / externalDependencyClasspath).value.map {_.data.getName} + val atestcp0 = (a / Test / fullClasspath).value + val atestcp = (a / Test / externalDependencyClasspath).value.map {_.data.getName} // This is checking to make sure interproject dependency works if (acp exists { _ contains "scalatest" }) { sys.error("scalatest found when it should NOT be included: " + acp.toString) 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 b452de8f3..a4d31725a 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 @@ -1,10 +1,12 @@ lazy val check = taskKey[Unit]("Runs the check") ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" +ThisBuild / organization := "org.example" +ThisBuild / version := "1.0" def commonSettings: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")), + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), dependencyCacheDirectory := (baseDirectory in LocalRootProject).value / "dependency", libraryDependencies := Seq( "net.databinder" %% "unfiltered-uploads" % "0.8.0", @@ -37,11 +39,9 @@ lazy val b = project. lazy val root = (project in file(".")). settings( - organization in ThisBuild := "org.example", - version in ThisBuild := "1.0", check := { - val acp = (externalDependencyClasspath in Compile in a).value.sortBy {_.data.getName} - val bcp = (externalDependencyClasspath in Compile in b).value.sortBy {_.data.getName} + val acp = (a / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} + val bcp = (b / Compile / externalDependencyClasspath).value.sortBy {_.data.getName} if (acp == bcp) () else sys.error("Different classpaths are found:" + "\n - a (overrides + cached) " + acp.toString + diff --git a/sbt-app/src/sbt-test/dependency-management/chainresolver/build.sbt b/sbt-app/src/sbt-test/dependency-management/chainresolver/build.sbt index 1f60e00b8..03636f64a 100644 --- a/sbt-app/src/sbt-test/dependency-management/chainresolver/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/chainresolver/build.sbt @@ -4,10 +4,10 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c def commonSettings: Seq[Def.Setting[_]] = Seq( - ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")), - scalaVersion in ThisBuild := "2.11.12", - organization in ThisBuild := "com.example", - version in ThisBuild := "0.1.0-SNAPSHOT", + ivyPaths := IvyPaths((ThisBuild / baseDirectory).value, Some((LocalRootProject / target).value / "ivy-cache")), + ThisBuild / scalaVersion := "2.11.12", + ThisBuild / organization := "com.example", + ThisBuild / version := "0.1.0-SNAPSHOT", autoScalaLibrary := false, crossPaths := false ) diff --git a/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt b/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt index 632ea2264..fe6cb61f2 100644 --- a/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt @@ -4,7 +4,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c 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") ) @@ -34,6 +34,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/global-plugins/test b/sbt-app/src/sbt-test/dependency-management/global-plugins/disable similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/global-plugins/test rename to sbt-app/src/sbt-test/dependency-management/global-plugins/disable diff --git a/sbt-app/src/sbt-test/dependency-management/global-plugins/global/plugins/metals.sbt b/sbt-app/src/sbt-test/dependency-management/global-plugins/global/plugins/metals.sbt index 8aae08736..533fdc0c0 100644 --- a/sbt-app/src/sbt-test/dependency-management/global-plugins/global/plugins/metals.sbt +++ b/sbt-app/src/sbt-test/dependency-management/global-plugins/global/plugins/metals.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.2.5") -addSbtPlugin("org.scalameta" % "sbt-metals" % "0.4.4") +// addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.2.5") +// addSbtPlugin("org.scalameta" % "sbt-metals" % "0.4.4") 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 862e728fc..4ea3c8582 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 @@ -6,7 +6,7 @@ ThisBuild / useCoursier := false 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(baseDirectory.value, Some((ThisBuild / baseDirectory).value / "ivy" / "cache")) ) lazy val sharedResolver: Resolver = { diff --git a/sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt b/sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt index 01a12cdaf..357b0fa35 100644 --- a/sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt +++ b/sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt @@ -2,8 +2,8 @@ lazy val root = project val checkComputedOnce = taskKey[Unit]("Check computed once") checkComputedOnce := { - val buildValue = (foo in ThisBuild).value + val buildValue = (ThisBuild / foo).value assert(buildValue == "build 0", "Setting in ThisBuild was computed twice") - val globalValue = (foo in Global).value + val globalValue = (ThisBuild / foo).value assert(globalValue == "global 0", "Setting in Global was computed twice") }