chore: add the scala-library projects (non-bootstrapped and bootstrapped)
#23510
+137
−0
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Compile Full Standard Library | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - 'main' | ||
| pull_request: | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| compile-nonbootstrapped: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Git Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: 17 | ||
|
There was a problem hiding this comment. We are already compiling the migration of stdlib with 17, ahead of the switch to Java 17 in 3.8.0 |
||
| cache: 'sbt' | ||
|
|
||
| - uses: sbt/setup-sbt@v1 | ||
| - name: Compile `scala-library-nonbootstrapped` | ||
| run: ./project/scripts/sbt scala-library-nonbootstrapped/compile | ||
|
|
||
| compile-bootstrapped: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Git Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: 17 | ||
| cache: 'sbt' | ||
|
|
||
| - uses: sbt/setup-sbt@v1 | ||
| - name: Compile `scala-library-bootstrapped` | ||
| run: ./project/scripts/sbt scala-library-bootstrapped/compile | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1411,6 +1411,95 @@ object Build { | |
| ) | ||
| ) | ||
|
|
||
| // ============================================================================================== | ||
| // =================================== SCALA STANDARD LIBRARY =================================== | ||
| // ============================================================================================== | ||
|
|
||
| /* Configuration of the org.scala-lang:scala-library:*.**.**-nonboostrapped project */ | ||
| lazy val `scala-library-nonbootstrapped` = project.in(file("library")) | ||
| .settings( | ||
| name := "scala-library-nonbootstrapped", | ||
| moduleName := "scala-library", | ||
| version := dottyNonBootstrappedVersion, | ||
| versionScheme := Some("semver-spec"), | ||
| scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published) | ||
| crossPaths := false, // org.scala-lang:scala-library doesn't have a crosspath | ||
| autoScalaLibrary := false, // do not add a dependency to stdlib | ||
| // Add the source directories for the stdlib (non-boostrapped) | ||
| Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src"), | ||
| Compile / unmanagedSourceDirectories += baseDirectory.value / "src-non-bootstrapped", | ||
| // NOTE: The only difference here is that we drop `-Werror` and semanticDB for now | ||
|
There was a problem hiding this comment. See https://github.com/scala/scala3/pull/23510/files#r2215995517 for details |
||
| Compile / scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-encoding", "UTF8", "-language:implicitConversions"), | ||
| (Compile / scalacOptions) ++= Seq( | ||
| // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called | ||
| "-sourcepath", (Compile / sourceDirectories).value.map(_.getCanonicalPath).distinct.mkString(File.pathSeparator), | ||
| ), | ||
| // Only publish compilation artifacts, no test artifacts | ||
| Compile / publishArtifact := true, | ||
| Test / publishArtifact := false, | ||
| // Do not allow to publish this project for now | ||
| publish / skip := true, | ||
| // Project specific target folder. sbt doesn't like having two projects using the same target folder | ||
|
Comment on lines
+1432
to
+1442
There was a problem hiding this comment. I understand the argument of explicit, duplicated, configuration, but maybe let's create a So stuff like the marked settings, There was a problem hiding this comment. I have a branch with these kind of changes but it's coming later. For now, I just need the base project to unblock some rebases like explicitly null checking the stdlib and stuff |
||
| target := target.value / "scala-library-nonbootstrapped", | ||
| ) | ||
|
|
||
| /* Configuration of the org.scala-lang:scala-library:*.**.**-boostrapped project */ | ||
| lazy val `scala-library-bootstrapped` = project.in(file("library")) | ||
| .settings( | ||
| name := "scala-library-bootstrapped", | ||
| moduleName := "scala-library", | ||
| version := dottyVersion, | ||
| versionScheme := Some("semver-spec"), | ||
| crossPaths := false, // org.scala-lang:scala-library doesn't have a crosspath | ||
| // Add the source directories for the stdlib (non-boostrapped) | ||
| Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src"), | ||
| Compile / unmanagedSourceDirectories += baseDirectory.value / "src-bootstrapped", | ||
| // NOTE: The only difference here is that we drop `-Werror` and semanticDB for now | ||
| Compile / scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-encoding", "UTF8", "-language:implicitConversions"), | ||
|
There was a problem hiding this comment. NIT: we're using here 2 ways of providing settings: using seperate strings ( |
||
| Compile / scalacOptions ++= Seq( | ||
| // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called | ||
| "-sourcepath", (Compile / sourceDirectories).value.map(_.getCanonicalPath).distinct.mkString(File.pathSeparator), | ||
| ), | ||
| // Only publish compilation artifacts, no test artifacts | ||
| Compile / publishArtifact := true, | ||
| Test / publishArtifact := false, | ||
| // Do not allow to publish this project for now | ||
| publish / skip := true, | ||
| // Project specific target folder. sbt doesn't like having two projects using the same target folder | ||
| target := target.value / "scala-library-bootstrapped", | ||
| // Configure the nonbootstrapped compiler | ||
| managedScalaInstance := false, | ||
| scalaInstance := { | ||
| val externalLibraryDeps = (`scala3-library` / Compile / externalDependencyClasspath).value.map(_.data).toSet | ||
| val externalCompilerDeps = (`scala3-compiler` / Compile / externalDependencyClasspath).value.map(_.data).toSet | ||
WojciechMazur marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // IMPORTANT: We need to use actual jars to form the ScalaInstance and not | ||
| // just directories containing classfiles because sbt maintains a cache of | ||
| // compiler instances. This cache is invalidated based on timestamps | ||
| // however this is only implemented on jars, directories are never | ||
| // invalidated. | ||
| val tastyCore = (`tasty-core` / Compile / packageBin).value | ||
| val scala3Library = (`scala3-library` / Compile / packageBin).value | ||
| val scala3Interfaces = (`scala3-interfaces` / Compile / packageBin).value | ||
| val scala3Compiler = (`scala3-compiler` / Compile / packageBin).value | ||
|
|
||
| val libraryJars = Array(scala3Library) ++ externalLibraryDeps | ||
| val compilerJars = Seq(tastyCore, scala3Interfaces, scala3Compiler) ++ (externalCompilerDeps -- externalLibraryDeps) | ||
|
|
||
| Defaults.makeScalaInstance( | ||
| scalaVersion.value, | ||
| libraryJars = libraryJars, | ||
| allCompilerJars = compilerJars, | ||
| allDocJars = Seq.empty, | ||
| state.value, | ||
| scalaInstanceTopLoader.value | ||
| ) | ||
| }, | ||
| scalaCompilerBridgeBinaryJar := { | ||
| Some((`scala3-sbt-bridge` / Compile / packageBin).value) | ||
| }, | ||
|
Comment on lines
+1473
to
+1500
There was a problem hiding this comment. This still uses the old compiler that uses the old stdlib, in another PR, when I add the versions of the compiler with the new stdlib as a dependency, we will proceed to the swap. |
||
| ) | ||
|
|
||
| def dottyLibrary(implicit mode: Mode): Project = mode match { | ||
| case NonBootstrapped => `scala3-library` | ||
| case Bootstrapped => `scala3-library-bootstrapped` | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests CI directives e.g.
[skip_ci]or[compile_nonboostrapped]are missing, currently we have already multiple jobs that would execute even though they're told to not be executed. If possible we should gradually try to unify all of GHA jobsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer not to have them for multiple reasons: