Merge pull request #9460 from eed3si9n/bport1/bump-ivy

[1.x] lm 1.12.3 + sjson-new 0.10.3

launch/src/main/input_resources/sbt/sbt.boot.properties

@@ -26,4 +26,5 @@
   ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/}
   checksums: ${sbt.checksums-sha1,md5}
   override-build-repos: ${sbt.override.build.repos-false}
+  repository-override: ${sbt.repository.override-${sbt.global.base-${user.home}/.sbt}/repositories_force}
   repository-config: ${sbt.repository.config-${sbt.global.base-${user.home}/.sbt}/repositories}

project/Dependencies.scala

@@ -15,7 +15,7 @@ object Dependencies {
   // sbt modules
   private val ioVersion = nightlyVersion.getOrElse("1.12.2")
   private val lmVersion =
-    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.12.2")
+    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.12.3")
   val zincVersion = nightlyVersion.getOrElse("1.12.0")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
@@ -23,7 +23,7 @@ object Dependencies {
   private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion
   private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
 
-  val launcherVersion = "1.5.2"
+  val launcherVersion = "1.6.2"
   val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion
   val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion
   val testInterface = "org.scala-sbt" % "test-interface" % "1.0"
@@ -81,7 +81,7 @@ object Dependencies {
   val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.1.13"
 
   def sjsonNew(n: String) =
-    Def.setting("com.eed3si9n" %% n % "0.10.1") // contrabandSjsonNewVersion.value
+    Def.setting("com.eed3si9n" %% n % "0.10.3") // contrabandSjsonNewVersion.value
   val sjsonNewScalaJson = sjsonNew("sjson-new-scalajson")
   val sjsonNewMurmurhash = sjsonNew("sjson-new-murmurhash")
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.6
+sbt.version=1.12.13

sbt-app/src/repo-override-test/force-proxy-repos-file/override-build-repos-sbt1-meta-build/build.sbt

@@ -0,0 +1,28 @@
+import scala.sys.process.*
+
+lazy val check = taskKey[Unit]("Verifies the repository override property applies to an sbt 1 meta-build")
+
+lazy val root = (project in file(".")).settings(
+  check := {
+    val base = baseDirectory.value
+    val globalBase = base / "global"
+    val launcher = file(sys.props("sbt.launch.jar"))
+    val java = file(sys.props("java.home")) / "bin" / "java"
+    val exitCode = Process(
+      Seq(
+        java.getAbsolutePath,
+        "-Dsbt.override.build.repos=true",
+        s"-Dsbt.repository.config=${(base / "repositories").getAbsolutePath}",
+        s"-Dsbt.global.base=${globalBase.getAbsolutePath}",
+        s"-Dsbt.boot.directory=${(globalBase / "boot").getAbsolutePath}",
+        "-Dsbt.server.autostart=false",
+        "-jar",
+        launcher.getAbsolutePath,
+        "reload plugins",
+        "checkMetaBuildResolvers"
+      ),
+      base / "nested"
+    ).!
+    assert(exitCode == 0, s"nested sbt exited with status $exitCode")
+  }
+)

sbt-app/src/repo-override-test/force-proxy-repos-file/override-build-repos-sbt1-meta-build/nested/build.sbt

@@ -0,0 +1 @@
+name := "nested"

sbt-app/src/repo-override-test/force-proxy-repos-file/override-build-repos-sbt1-meta-build/nested/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.12.11

sbt-app/src/repo-override-test/force-proxy-repos-file/override-build-repos-sbt1-meta-build/nested/project/build.sbt

@@ -0,0 +1,6 @@
+val checkMetaBuildResolvers = taskKey[Unit]("Verifies the meta-build repository override")
+
+checkMetaBuildResolvers := {
+  val names = csrResolvers.value.map(_.name).sorted
+  assert(names == Seq("internal-proxy", "local"), s"unexpected meta-build resolvers: $names")
+}

sbt-app/src/repo-override-test/force-proxy-repos-file/override-build-repos-sbt1-meta-build/repositories

@@ -0,0 +1,3 @@
+[repositories]
+  local
+  internal-proxy: https://repo.maven.apache.org/maven2

sbt-app/src/repo-override-test/force-proxy-repos-file/override-build-repos-sbt1-meta-build/test

@@ -0,0 +1 @@
+> check