Merge pull request #545 from eed3si9n/wip/bump

Cross build to sbt 2.0.0-M3

build.sbt

@@ -7,7 +7,7 @@ ThisBuild / version := {
 ThisBuild / organization := "com.eed3si9n"
 
 def scala212 = "2.12.20"
-def scala3 = "3.3.4"
+def scala3 = "3.6.2"
 ThisBuild / crossScalaVersions := Seq(scala212, scala3)
 ThisBuild / scalaVersion := scala3
 
@@ -37,13 +37,13 @@ lazy val root = (project in file("."))
     (pluginCrossBuild / sbtVersion) := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.5.8"
-        case _      => "2.0.0-M2"
+        case _      => "2.0.0-M3"
       }
     }
     scriptedSbt := {
       scalaBinaryVersion.value match {
-        case "2.12" => "1.10.2"
-        case _      => "2.0.0-M2"
+        case "2.12" => "1.10.7"
+        case _      => "2.0.0-M3"
       }
     }
     Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "scala"

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.7

src/sbt-test/caching/caching/build.sbt

@@ -44,11 +44,3 @@ lazy val root = (project in file(".")).
       ()
     }
   )
-
-TaskKey[Unit]("fileCheck1") := {
-  assert((crossTarget.value / "foo.jar").exists())
-}
-
-TaskKey[Unit]("fileCheck2") := {
-  assert((crossTarget.value / "jarHash.txt").exists())
-}

src/sbt-test/caching/caching/test

@@ -1,12 +1,12 @@
 # check if the file gets created
 > clean
 > assembly
-> fileCheck1
+$ exists target/**/foo.jar
 
 # run to cache the hash, then check it's consistent
 > check
 > checkhash
-> fileCheck2
+$ exists target/**/jarHash.txt
 > checkhash
 
 > assembly

src/sbt-test/caching/custommergestrat/build.sbt

@@ -40,7 +40,3 @@ def mustContain(f: File, l: Seq[String]): Unit = {
 TaskKey[Unit]("copy-preserve-last-modified") := {
   IO.copy(Seq((crossTarget.value / "foo.jar") -> (crossTarget.value / "foo-1.jar")), true, true, true)
 }
-
-TaskKey[Unit]("fileCheck1") := {
-  assert((crossTarget.value / "foo.jar").exists())
-}

src/sbt-test/caching/custommergestrat/test

@@ -1,5 +1,5 @@
 > assembly
-> fileCheck1
+$ exists target/**/foo.jar
 > check
 > copyPreserveLastModified
 
@@ -8,6 +8,6 @@
 
 # assembly should run again, invalidating the cache because of the custom merge strategy
 > assembly
-> fileCheck1
+$ exists target/**/foo.jar
 > check
 # $ newer target/scala-2.12/foo.jar target/scala-2.12/foo-1.jar

src/sbt-test/merging/merging/test

@@ -1,6 +1,6 @@
 # check if the file gets created
-> debug
 > assembly
+$ exists target/**/foo.jar
 
 # check if it says hello
 > check

src/sbt-test/sbt-assembly/appendhash/build.sbt

@@ -23,8 +23,9 @@ lazy val root = (project in file("."))
     },
 
     TaskKey[Unit]("checkPrevious") := {
-      import sbinary.DefaultProtocol._
-      import CacheImplicits._
+      import sbinary.DefaultProtocol.*
+      import CacheImplicits.{given, *}
+      import Def.*
       assert(Some(assembly.value) == assembly.previous)
     }
   )

src/sbt-test/sbt-assembly/config/build.sbt

@@ -12,7 +12,3 @@ lazy val root = (project in file("."))
       ()
     }
   )
-
-TaskKey[Unit]("fileCheck") := {
-  assert((crossTarget.value / "foo.jar").exists())
-}

src/sbt-test/sbt-assembly/config/test

@@ -1,6 +1,6 @@
 # check if the file gets created
 > Test/assembly
-> fileCheck
+$ exists target/**/foo.jar
 
 # check if it says hello
 > check

src/sbt-test/sbt-assembly/deps/build.sbt

@@ -31,7 +31,3 @@ lazy val root = (project in file("."))
       ()
     }
   )
-
-TaskKey[Unit]("fileCheck") := {
-  assert((crossTarget.value / "foo.jar").exists())
-}

src/sbt-test/sbt-assembly/deps/test

@@ -1,6 +1,6 @@
 # check if the file gets created
 > assembly
-> fileCheck
+$ exists target/**/foo.jar
 
 # check if it says hello
 > check

src/sbt-test/sbt-assembly/piecemeal/build.sbt

@@ -33,10 +33,6 @@ lazy val root = (project in file("."))
     }
   )
 
-TaskKey[Unit]("fileCheck1") := {
-  assert((crossTarget.value / "foo-assembly-0.1.jar").exists())
-}
-
 TaskKey[Unit]("fileCheck2") := {
   assert((crossTarget.value / "foo-assembly-0.1-deps.jar").exists())
 }

src/sbt-test/sbt-assembly/piecemeal/test

@@ -1,17 +1,17 @@
 # check if the file gets created
 > assembly
-> fileCheck1
+$ exists target/**/foo-assembly-0.1.jar
 
 # try running this JAR. this should fail
 -> check1
 
 # check if the file gets created
 > assemblyPackageDependency
-> fileCheck2
+$ exists target/**/foo-assembly-0.1-deps.jar
 
 # check if the file gets created
 > assemblyPackageScala
-> fileCheck3
+$ exists target/**/scala-library-2.12.18-assembly.jar
 
 # check if it says hello
 > check2

src/sbt-test/sbt-assembly/simple/build.sbt

@@ -8,7 +8,3 @@ TaskKey[Unit]("check") := {
   if (out.trim != "hello") sys.error("unexpected output: " + out)
   ()
 }
-
-TaskKey[Unit]("fileCheck") := {
-  assert((crossTarget.value / "foo.jar").exists())
-}

src/sbt-test/sbt-assembly/simple/test

@@ -1,6 +1,6 @@
 # check if the file gets created
 > assembly
-> fileCheck
+$ exists target/**/foo.jar
 
 # check if it says hello
 > check

src/sbt-test/shading/shading/test

@@ -1,5 +1,6 @@
 # check if the file gets created
 > assembly
+$ exists target/**/foo.jar
 
 # check if it says hello
 > check