Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set reference version to 3.5.0-RC4 #21175

Merged
merged 4 commits into from
Jul 12, 2024
Merged

Set reference version to 3.5.0-RC4 #21175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dbfcbe
Set reference version to 3.5.0-RC4
WojciechMazur Jul 11, 2024
6c3c19f
Move experimental annotation sources back to shared library/src
WojciechMazur Jul 11, 2024
9a17f4b
Move scala.runtime.TupledFunctions from `bootstrapped` to shared sources
WojciechMazur Jul 11, 2024
8f71e8f
Revert bootstrap specificic settings after upgrade of reference version
WojciechMazur Jul 11, 2024
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
3 changes: 0 additions & 3 deletions library/src-non-bootstrapped/scala/annotation/experimental.scala
View file
Open in desktop

This file was deleted.

0 ...apped/scala/annotation/experimental.scala → ...y/src/scala/annotation/experimental.scala
View file
Open in desktop
File renamed without changes.
0 ...apped/scala/runtime/TupledFunctions.scala → ...y/src/scala/runtime/TupledFunctions.scala
View file
Open in desktop
File renamed without changes.
16 changes: 4 additions & 12 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ object DottyJSPlugin extends AutoPlugin {
object Build {
import ScaladocConfigs._

val referenceVersion = "3.4.2-RC1"
val referenceVersion = "3.5.0-RC4"

val baseVersion = "3.6.0"
// Will be required by some automation later
Expand Down Expand Up @@ -617,7 +617,7 @@ object Build {
// Settings shared between scala3-compiler and scala3-compiler-bootstrapped
lazy val commonDottyCompilerSettings = Seq(
// Note: bench/profiles/projects.yml should be updated accordingly.
Compile / scalacOptions ++= Seq("-Yexplicit-nulls"),
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),

// Use source 3.3 to avoid fatal migration warnings on scalajs-ir
scalacOptions ++= Seq("-source", "3.3"),
Expand Down Expand Up @@ -894,8 +894,6 @@ object Build {
}

lazy val nonBootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
// FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
scalacOptions += "-Ysafe-init",
// packageAll packages all and then returns a map with the abs location
packageAll := Def.taskDyn { // Use a dynamic task to avoid loops when loading the settings
Def.task {
Expand Down Expand Up @@ -923,8 +921,6 @@ object Build {
)

lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
// FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
scalacOptions += "-Wsafe-init",
javaOptions ++= {
val jars = packageAll.value
Seq(
Expand Down Expand Up @@ -1356,7 +1352,7 @@ object Build {
BuildInfoPlugin.buildInfoScopedSettings(Test) ++
BuildInfoPlugin.buildInfoDefaultSettings

def presentationCompilerSettings(implicit mode: Mode) = {
lazy val presentationCompilerSettings = {
val mtagsVersion = "1.3.2"
Seq(
libraryDependencies ++= Seq(
Expand All @@ -1371,11 +1367,7 @@ object Build {
ivyConfigurations += SourceDeps.hide,
transitiveClassifiers := Seq("sources"),
scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings
// FIXME change this to just Seq("-Yexplicit-nulls, "-Wsafe-init") when reference is set to 3.5.0
Compile / scalacOptions ++= (mode match {
case Bootstrapped => Seq("-Yexplicit-nulls", "-Wsafe-init")
case NonBootstrapped => Seq("-Yexplicit-nulls", "-Ysafe-init")
}),
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),
Compile / sourceGenerators += Def.task {
val s = streams.value
val cacheDir = s.cacheDirectory
Expand Down