From df218e4720f16312a1ca0825de5d8d24c17d50c0 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Fri, 30 May 2025 10:29:16 +0200 Subject: [PATCH 1/3] Upgrade sbt to 1.11.0 [Cherry-picked bd6d784f4a3fe5ce3472fa3ae04ead4c31bfefe1] --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 73df629ac1a7..6520f6981d5a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.0 From 2edb6363a27573eed45f5ffa84395bd179a95810 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Fri, 30 May 2025 10:30:23 +0200 Subject: [PATCH 2/3] Use sbt built-in sonatype central releasing instead of using xerial/sbt-sonatype plugin --- .github/workflows/ci.yaml | 4 ++-- project/Build.scala | 7 +++++-- project/plugins.sbt | 2 -- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b22a44c7db7c..fdd3fa99f764 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -605,7 +605,7 @@ jobs: - name: Publish Nightly if: "steps.not_yet_published.outcome == 'success'" run: | - ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease" + ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaRelease" nightly_documentation: runs-on: [self-hosted, Linux] @@ -746,7 +746,7 @@ jobs: ./dist/target/sha256sum.txt - name: Publish Release - run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleUpload" + run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload" open_issue_on_failure: diff --git a/project/Build.scala b/project/Build.scala index af982d26516d..d6a97933362b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -16,7 +16,6 @@ import sbt.plugins.SbtPlugin import sbt.ScriptedPlugin.autoImport._ import xerial.sbt.pack.PackPlugin import xerial.sbt.pack.PackPlugin.autoImport._ -import xerial.sbt.Sonatype.autoImport._ import com.typesafe.tools.mima.plugin.MimaPlugin.autoImport._ import org.scalajs.sbtplugin.ScalaJSPlugin import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ @@ -1915,7 +1914,11 @@ object Build { lazy val publishSettings = Seq( publishMavenStyle := true, isSnapshot := version.value.contains("SNAPSHOT"), - publishTo := sonatypePublishToBundle.value, + publishTo := { + val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/" + if (isSnapshot.value) Some("central-snapshots" at centralSnapshots) + else localStaging.value + }, publishConfiguration ~= (_.withOverwrite(true)), publishLocalConfiguration ~= (_.withOverwrite(true)), projectID ~= {id => diff --git a/project/plugins.sbt b/project/plugins.sbt index f8e2aa37126b..3ce5f69d81c1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,8 +8,6 @@ libraryDependencySchemes += addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") - addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.17") From b5cf0658982e693d5228c6ca7fe3263b23145989 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Mon, 2 Jun 2025 13:46:10 +0200 Subject: [PATCH 3/3] Use sbt built-in sonatype central releasing instead of using xerial/sbt-sonatype plugin [Cherry-picked cf83d87cd09de0c94f9bab85ad592c78aca4867f][modified]