Adjust scripted tests

eed3si9n · Sep 22, 2024 · 3eba352 · 3eba352
1 parent 558bfe6
commit 3eba352
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 25 deletions.
diff --git a/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt b/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt
@@ -1,5 +1,4 @@
 scalaVersion := "2.12.19"
-name := "root"
 
 lazy val core = project
   .settings(

diff --git a/sbt-app/src/sbt-test/project-matrix/custom/build.sbt b/sbt-app/src/sbt-test/project-matrix/custom/build.sbt
@@ -1,12 +1,11 @@
-ThisBuild / organization := "com.example"
-ThisBuild / version := "0.1.0-SNAPSHOT"
-ThisBuild / publishMavenStyle := true
-
-ThisBuild / ivyPaths := {
-  val base = (ThisBuild / baseDirectory).value
-  IvyPaths(base.toString, s"$base/ivy-cache")
+organization := "com.example"
+version := "0.1.0-SNAPSHOT"
+publishMavenStyle := true
+ivyPaths := {
+  val base = baseDirectory.value
+  val thisBuildBase = (ThisBuild / baseDirectory).value
+  IvyPaths(base.toString, s"$thisBuildBase/ivy-cache")
 }
-publish / skip := true
 
 lazy val config12 = ConfigAxis("Config1_2", "config1.2")
 lazy val config13 = ConfigAxis("Config1_3", "config1.3")
@@ -21,7 +20,6 @@ lazy val app = (projectMatrix in file("app"))
   .dependsOn(core)
   .settings(
     name := "app",
-    ivyPaths := (ThisBuild / ivyPaths).value
   )
   .customRow(
     scalaVersions = Seq(scala212, scala211),

diff --git a/sbt-app/src/sbt-test/project-matrix/java/build.sbt b/sbt-app/src/sbt-test/project-matrix/java/build.sbt
@@ -1,12 +1,11 @@
-ThisBuild / organization := "com.example"
-ThisBuild / version := "0.1.0-SNAPSHOT"
-ThisBuild / publishMavenStyle := true
-
-ThisBuild / ivyPaths := {
-  val base = (ThisBuild / baseDirectory).value
-  IvyPaths(base.toString, s"$base/ivy-cache")
+organization := "com.example"
+version := "0.1.0-SNAPSHOT"
+publishMavenStyle := true
+ivyPaths := {
+  val base = baseDirectory.value
+  val thisBuildBase = (ThisBuild / baseDirectory).value
+  IvyPaths(base.toString, s"$thisBuildBase/ivy-cache")
 }
-publish / skip := true
 
 lazy val config12 = ConfigAxis("Config1_2", "-config1.2")
 lazy val config13 = ConfigAxis("Config1_3", "-config1.3")
@@ -16,7 +15,6 @@ lazy val scala212 = "2.12.10"
 lazy val app = (projectMatrix in file("app"))
   .settings(
     name := "app",
-    ivyPaths := (ThisBuild / ivyPaths).value
   )
   .customRow(
     scalaVersions = Seq(scala212),

diff --git a/sbt-app/src/sbt-test/reporter/nowarn/build.sbt b/sbt-app/src/sbt-test/reporter/nowarn/build.sbt
@@ -1,13 +1,19 @@
-ThisBuild / scalaVersion := "2.12.17"
+scalaVersion := "2.12.19"
 
 lazy val sub1 = project
 
 lazy val sub2 = project
 
 val assertNoWarning = taskKey[Unit]("checks warning *is not* emitted")
-
 val assertWarning = taskKey[Unit]("checks warning *is* emitted")
 
+lazy val root = (project in file("."))
+  .aggregate(sub1, sub2)
+  .settings(
+    assertWarning := check(true).value,
+    assertNoWarning := check(false).value,
+  )
+
 def check(expectation: Boolean) = Def.task[Unit] {
   val lastLog: File = BuiltinCommands.lastLogFile(state.value).get
   val last: String = IO.read(lastLog)
@@ -20,7 +26,3 @@ def check(expectation: Boolean) = Def.task[Unit] {
     IO.write(lastLog, "") // clear the backing log for for 'last'.
   }
 }
-
-assertWarning := check(true).value
-
-assertNoWarning := check(false).value