Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:

publish-winget:
uses: ./.github/workflows/publish-winget.yml
if: false # TODO: Requires setting up initial WinGet package
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't this work previously?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, never, see #22184

with:
version: ${{ inputs.version }}
secrets:
Expand Down
17 changes: 9 additions & 8 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -456,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}
Expand Down Expand Up @@ -1622,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"),
Expand Down Expand Up @@ -1994,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
Expand Down Expand Up @@ -2081,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"),
Expand Down Expand Up @@ -2357,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"),
Expand Down Expand Up @@ -2581,7 +2582,7 @@ object Build {
.dependsOn(`scala3-interfaces`, `tasty-core-bootstrapped-new`, `scala3-library-bootstrapped-new`)
.settings(publishSettings)
.settings(
name := "scala3-compiler-bootstrapped",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are not necessary to remove, the moduleName two lines below is what defines the name of the artifact. We should keep these to know in sbt if we manipulate a bootstrapped project or a on-bootstrapped project.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but these are later exposed publicly as attributes in POM https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.4/scala3-compiler_3-3.7.4.pom - see both name and description

The non-bootstrapped projects have the nonbootstrapped suffix, so it should be fine

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll accept this PR assuming that the non-bootstrapped projects are label.

name := "scala3-compiler",
moduleName := "scala3-compiler",
version := dottyVersion,
versionScheme := Some("semver-spec"),
Expand Down Expand Up @@ -3790,15 +3791,15 @@ 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(
Developer(
id = "scala",
name = "The Scala Team",
email = "security@scala-lang.org",
url = url("https://scala-lang.org")
url = url(homepageUrl)
)
),
)
Expand Down
Loading