From b679ad00c2401349ef56e47d60767eee93fcb5e9 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 13 Nov 2025 16:53:35 +0100 Subject: [PATCH 1/6] Let homepage point to scala-lang.org instead of GitHub repo --- project/Build.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 1d236d9d0b97..b086ecef58a8 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -186,6 +186,7 @@ object Build { */ val stdlibBootstrappedVersion = "2.13.16" + val homepageUrl = "https://scala-lang.org/" val dottyOrganization = "org.scala-lang" val dottyGithubUrl = "https://github.com/scala/scala3" val dottyGithubRawUserContentUrl = "https://raw.githubusercontent.com/scala/scala3" @@ -3790,7 +3791,7 @@ object Build { id.withExtraAttributes(id.extraAttributes + line) }, Test / publishArtifact := false, - homepage := Some(url(dottyGithubUrl)), + homepage := Some(url(homepageUrl)), licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))), scmInfo := Some(ScmInfo(url(dottyGithubUrl), "scm:git:git@github.com:scala/scala3.git")), developers := List( @@ -3798,7 +3799,7 @@ object Build { id = "scala", name = "The Scala Team", email = "security@scala-lang.org", - url = url("https://scala-lang.org") + url = url(homepageUrl) ) ), ) From 4439c44fa32e3d9a0a91853abd3be2fb1983424b Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 13 Nov 2025 17:41:54 +0100 Subject: [PATCH 2/6] Disable publishing WinGet package - never worked --- .github/workflows/releases.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index b81166aec84e..0f3c9449c478 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -32,6 +32,7 @@ jobs: publish-winget: uses: ./.github/workflows/publish-winget.yml + if: false # TODO: Requires setting up initial WinGet package with: version: ${{ inputs.version }} secrets: From 1aee659b86f9b8c1ff5a19c3d7c059e952e00f3c Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 13 Nov 2025 17:52:19 +0100 Subject: [PATCH 3/6] Publish using the new artifacts --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6df3773e4445..3671d7560847 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -219,7 +219,7 @@ jobs: - name: Check compiler version shell: bash run : | - version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1) + version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped-new/version" | tail -n1) echo "This build version: ${version}" if [ "${version}" != "${{ env.RELEASE_TAG }}" ]; then echo "Compiler version for this build '${version}', does not match tag: ${{ env.RELEASE_TAG }}" @@ -291,7 +291,7 @@ jobs: scala3-${{ env.RELEASE_TAG }}.msi - name: Publish Release - run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload" + run: ./project/scripts/sbtPublish ";project scala3-bootstrapped-new ;publishSigned ;sonaUpload" build-msi-package: uses: ./.github/workflows/build-msi.yml From b340f1cb7e8bfdc5b6b2f9ef82fc383213a9d004 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 13 Nov 2025 18:22:19 +0100 Subject: [PATCH 4/6] Strip `-bootstrap` suffix from all published JARs names - no need to expose implementation detail in POM metadata --- project/Build.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index b086ecef58a8..c787b75ca759 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -457,7 +457,7 @@ object Build { import java.text._ val dateFormat = new SimpleDateFormat("yyyyMMdd-HHmmss") dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")) - + val fileName = "compiler.properties" val contents = Def.setting { s"""version.number=${version.value} @@ -1623,7 +1623,7 @@ object Build { .dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-repl`) // TODO: Would this actually evict the reference compiler in scala-tool? .settings(publishSettings) .settings( - name := "scala3-sbt-bridge-bootstrapped", + name := "scala3-sbt-bridge", moduleName := "scala3-sbt-bridge", version := dottyVersion, versionScheme := Some("semver-spec"), @@ -1995,7 +1995,7 @@ object Build { .enablePlugins(ScalaLibraryPlugin) .settings(publishSettings) .settings( - name := "scala-library-bootstrapped", + name := "scala-library", moduleName := "scala-library", version := dottyVersion, // We mark the current library as "always" instead of "semver-spec" so that buildtools can @@ -2082,7 +2082,7 @@ object Build { .dependsOn(`scala-library-bootstrapped`) .settings(publishSettings) .settings( - name := "scala3-library-bootstrapped", + name := "scala3-library", moduleName := "scala3-library", version := dottyVersion, versionScheme := Some("semver-spec"), @@ -2358,7 +2358,7 @@ object Build { .settings(publishSettings) .settings(commonMiMaSettings) .settings( - name := "tasty-core-bootstrapped", + name := "tasty-core", moduleName := "tasty-core", version := dottyVersion, versionScheme := Some("semver-spec"), @@ -2582,7 +2582,7 @@ object Build { .dependsOn(`scala3-interfaces`, `tasty-core-bootstrapped-new`, `scala3-library-bootstrapped-new`) .settings(publishSettings) .settings( - name := "scala3-compiler-bootstrapped", + name := "scala3-compiler", moduleName := "scala3-compiler", version := dottyVersion, versionScheme := Some("semver-spec"), From 68eb3dc698ad78d0f5af6877a89dbaa11f88f9fe Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 13 Nov 2025 19:17:55 +0100 Subject: [PATCH 5/6] Temporary disable dist packaging (to be fixed in RC2/RC3) --- .github/workflows/ci.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3671d7560847..eb8df219c65c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -227,6 +227,7 @@ jobs: fi - name: Prepare the SDKs + if: false # TODO: Requires changes to dist targets, to be done before stable release shell: bash run : | prepareSDK() { @@ -253,11 +254,13 @@ jobs: prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/" - name: Download MSI package + if: false # TODO: Requires changes to dist targets, to be done before stable release uses: actions/download-artifact@v6 with: name: scala.msi path: . - name: Prepare MSI package + if: false # TODO: Requires changes to dist targets, to be done before stable release shell: bash run: | msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi" @@ -285,10 +288,11 @@ jobs: --latest=${{ !contains(env.RELEASE_TAG, '-RC') }} \ --prerelease=${{ contains(env.RELEASE_TAG, '-RC') }} \ --verify-tag ${{ env.RELEASE_TAG }} \ - scala3-${{ env.RELEASE_TAG }}*.zip \ - scala3-${{ env.RELEASE_TAG }}*.tar.gz \ - scala3-${{ env.RELEASE_TAG }}*.sha256 \ - scala3-${{ env.RELEASE_TAG }}.msi + # TODO: dist packaging for 3.8.0 stable release + # scala3-${{ env.RELEASE_TAG }}*.zip \ + # scala3-${{ env.RELEASE_TAG }}*.tar.gz \ + # scala3-${{ env.RELEASE_TAG }}*.sha256 \ + # scala3-${{ env.RELEASE_TAG }}.msi - name: Publish Release run: ./project/scripts/sbtPublish ";project scala3-bootstrapped-new ;publishSigned ;sonaUpload" From aeb0f93f1c2626aed1a89f812ddaa8102abd08be Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 13 Nov 2025 19:18:11 +0100 Subject: [PATCH 6/6] Revert "Strip `-bootstrap` suffix from all published JARs names - no need to expose implementation detail in POM metadata" This reverts commit b340f1cb7e8bfdc5b6b2f9ef82fc383213a9d004. --- project/Build.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index c787b75ca759..b086ecef58a8 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -457,7 +457,7 @@ object Build { import java.text._ val dateFormat = new SimpleDateFormat("yyyyMMdd-HHmmss") dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")) - + val fileName = "compiler.properties" val contents = Def.setting { s"""version.number=${version.value} @@ -1623,7 +1623,7 @@ object Build { .dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-repl`) // TODO: Would this actually evict the reference compiler in scala-tool? .settings(publishSettings) .settings( - name := "scala3-sbt-bridge", + name := "scala3-sbt-bridge-bootstrapped", moduleName := "scala3-sbt-bridge", version := dottyVersion, versionScheme := Some("semver-spec"), @@ -1995,7 +1995,7 @@ object Build { .enablePlugins(ScalaLibraryPlugin) .settings(publishSettings) .settings( - name := "scala-library", + name := "scala-library-bootstrapped", moduleName := "scala-library", version := dottyVersion, // We mark the current library as "always" instead of "semver-spec" so that buildtools can @@ -2082,7 +2082,7 @@ object Build { .dependsOn(`scala-library-bootstrapped`) .settings(publishSettings) .settings( - name := "scala3-library", + name := "scala3-library-bootstrapped", moduleName := "scala3-library", version := dottyVersion, versionScheme := Some("semver-spec"), @@ -2358,7 +2358,7 @@ object Build { .settings(publishSettings) .settings(commonMiMaSettings) .settings( - name := "tasty-core", + name := "tasty-core-bootstrapped", moduleName := "tasty-core", version := dottyVersion, versionScheme := Some("semver-spec"), @@ -2582,7 +2582,7 @@ object Build { .dependsOn(`scala3-interfaces`, `tasty-core-bootstrapped-new`, `scala3-library-bootstrapped-new`) .settings(publishSettings) .settings( - name := "scala3-compiler", + name := "scala3-compiler-bootstrapped", moduleName := "scala3-compiler", version := dottyVersion, versionScheme := Some("semver-spec"),