Merge pull request #552 from eed3si9n/wip/bump-sbt

eed3si9n · web-flow · commit 7159e74fb0b9 · 2025-03-13T00:04:41.000-04:00
sbt 2.0.0-M4
diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ ThisBuild / version := {
 ThisBuild / organization := "com.eed3si9n"
 
 def scala212 = "2.12.20"
-def scala3 = "3.6.2"
+def scala3 = "3.6.4"
 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-M3"
+        case _      => "2.0.0-M4"
       }
     }
     scriptedSbt := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.10.7"
-        case _      => "2.0.0-M3"
+        case _      => "2.0.0-M4"
       }
     }
     Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "scala"
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.10.10

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ ThisBuild / version := {`
`7`	`7`	`ThisBuild / organization := "com.eed3si9n"`
`8`	`8`
`9`	`9`	`def scala212 = "2.12.20"`
`10`		`-def scala3 = "3.6.2"`
	`10`	`+def scala3 = "3.6.4"`
`11`	`11`	`ThisBuild / crossScalaVersions := Seq(scala212, scala3)`
`12`	`12`	`ThisBuild / scalaVersion := scala3`
`13`	`13`
`@@ -37,13 +37,13 @@ lazy val root = (project in file("."))`
`37`	`37`	`(pluginCrossBuild / sbtVersion) := {`
`38`	`38`	`scalaBinaryVersion.value match {`
`39`	`39`	`case "2.12" => "1.5.8"`
`40`		`- case _ => "2.0.0-M3"`
	`40`	`+ case _ => "2.0.0-M4"`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`scriptedSbt := {`
`44`	`44`	`scalaBinaryVersion.value match {`
`45`	`45`	`case "2.12" => "1.10.7"`
`46`		`- case _ => "2.0.0-M3"`
	`46`	`+ case _ => "2.0.0-M4"`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "scala"`