From a0e4d22a6cd94ab3262af4aa49e6311e6686a6bb Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 6 Jul 2024 15:20:13 -0400 Subject: [PATCH 1/8] sjson-new 0.10.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b622edf79..db05c9d88 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -80,7 +80,7 @@ object Dependencies { val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.1.4" def sjsonNew(n: String) = - Def.setting("com.eed3si9n" %% n % "0.9.1") // contrabandSjsonNewVersion.value + Def.setting("com.eed3si9n" %% n % "0.10.1") // contrabandSjsonNewVersion.value val sjsonNewScalaJson = sjsonNew("sjson-new-scalajson") val sjsonNewMurmurhash = sjsonNew("sjson-new-murmurhash") From e32618529d9ee433c830c766d8d584e095afff35 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 6 Jul 2024 16:36:20 -0400 Subject: [PATCH 2/8] Scala 2.13.14 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index db05c9d88..46f200015 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too val scala212 = "2.12.19" - val scala213 = "2.13.12" + val scala213 = "2.13.14" val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 def nightlyVersion: Option[String] = @@ -134,5 +134,5 @@ object Dependencies { val hedgehog = "qa.hedgehog" %% "hedgehog-sbt" % "0.7.0" val disruptor = "com.lmax" % "disruptor" % "3.4.2" - val kindProjector = ("org.typelevel" % "kind-projector" % "0.13.2").cross(CrossVersion.full) + val kindProjector = ("org.typelevel" % "kind-projector" % "0.13.3").cross(CrossVersion.full) } From 70b829ec5443e8708456336ebdfd0e67eaf3ed32 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 6 Jul 2024 16:43:13 -0400 Subject: [PATCH 3/8] sbt 1.10.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e8a1e246e..081fdbbc7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.10.0 From c2009716e1c77a0a0379e877c5ac21522c766e0b Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 7 Jul 2024 14:22:47 -0400 Subject: [PATCH 4/8] Zinc 1.10.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 46f200015..410e3bdd3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { private val ioVersion = nightlyVersion.getOrElse("1.10.0") private val lmVersion = sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.0") - val zincVersion = nightlyVersion.getOrElse("1.10.0") + val zincVersion = nightlyVersion.getOrElse("1.10.1") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From d7a0db2334d646a623995cc026bb845538a28749 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 7 Jul 2024 15:50:55 -0400 Subject: [PATCH 5/8] Lm 1.10.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 410e3bdd3..f52b1153d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { // sbt modules private val ioVersion = nightlyVersion.getOrElse("1.10.0") private val lmVersion = - sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.0") + sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.1") val zincVersion = nightlyVersion.getOrElse("1.10.1") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From c42766a1235c51b8fe33695ccf830e8bc2d2b435 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 7 Jul 2024 17:23:25 -0400 Subject: [PATCH 6/8] Launcher 1.4.3 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f52b1153d..2bf0d2741 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,7 +22,7 @@ object Dependencies { private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion - val launcherVersion = "1.4.2" + val launcherVersion = "1.4.3" val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion val testInterface = "org.scala-sbt" % "test-interface" % "1.0" From 317e991b87d9fe34c51766bfbb3a684c5051e476 Mon Sep 17 00:00:00 2001 From: SlowBrainDude <126806769+SlowBrainDude@users.noreply.github.com> Date: Fri, 19 Jul 2024 23:30:32 +0200 Subject: [PATCH 7/8] Using common Scala 2.12 version for the sbtn subproject The old, hardcoded Scala 2.12 version previously used for the sbtn project (as a kind of workaround?) was no longer supported by Scala IDE tooling. But sbtn builds just fine when using the current global setting for the Scala 2.12 version, so this commit removes the hardcoded version. --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3eba2b719..98d0e71dc 100644 --- a/build.sbt +++ b/build.sbt @@ -1165,7 +1165,6 @@ lazy val sbtClientProj = (project in file("client")) .dependsOn(commandProj) .settings( commonBaseSettings, - scalaVersion := "2.12.11", // The thin client does not build with 2.12.12 publish / skip := true, name := "sbt-client", mimaPreviousArtifacts := Set.empty, From 242b8686e8b422cea721a4882a296fe92778fa87 Mon Sep 17 00:00:00 2001 From: SlowBrainDude <126806769+SlowBrainDude@users.noreply.github.com> Date: Sat, 20 Jul 2024 01:20:45 +0200 Subject: [PATCH 8/8] Note in DEV docs on supported build time JDK dependency --- DEVELOPING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DEVELOPING.md b/DEVELOPING.md index 8616765d3..beff0e099 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -18,6 +18,12 @@ The `develop` branch represents sbt 2.x, the next major sbt series. Next minor branch is where new features should be added as long as it is binary compatible with sbt 1.x. The `stable` branch represents the current stable sbt release. Only bug fixes are back-ported to the stable branch. +### Note on supported JDK version for the SBT build + +The SBT build itself currently doesn't support any JDK beyond version 17. You will run into deprecation warnings (which would become build errors due to build configuration) if you use any later JDK version to build SBT. + +If you're using Metals as IDE, also check the `Java Version` setting. The default at the time of writing this is `17`, but this may change in the future, or you may have set it to a later version yourself. (Be aware that Metals may download a JDK in the background if you haven't switch to a local JDK matching the version before changing this setting. Also, this setting is currently only available as a `User` setting, so you can't set it for a single workspace. Don't forget to switch back if you need to for other projects). + ### Instruction to build just sbt Sbt has a number of sub-modules. If the change you are making is just contained in sbt/sbt (not one of the sub-modules),