From 9d9e2ee6775ab020b69d7f055368aea4c1ac7c28 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 11 Jul 2024 14:16:05 +0200 Subject: [PATCH 1/4] Set reference version to 3.5.0-RC4 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 2024f1a24f5c..3ec4805a06b6 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -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.5.1-RC1" From d8828ae8b735d7fc0bbdebe503645cec0920ad33 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 11 Jul 2024 14:56:13 +0200 Subject: [PATCH 2/4] Move experimental annotation sources back to shared library/src --- .../src-non-bootstrapped/scala/annotation/experimental.scala | 3 --- .../scala/annotation/experimental.scala | 0 2 files changed, 3 deletions(-) delete mode 100644 library/src-non-bootstrapped/scala/annotation/experimental.scala rename library/{src-bootstrapped => src}/scala/annotation/experimental.scala (100%) diff --git a/library/src-non-bootstrapped/scala/annotation/experimental.scala b/library/src-non-bootstrapped/scala/annotation/experimental.scala deleted file mode 100644 index e879b47e12ff..000000000000 --- a/library/src-non-bootstrapped/scala/annotation/experimental.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.annotation - -final class experimental extends StaticAnnotation diff --git a/library/src-bootstrapped/scala/annotation/experimental.scala b/library/src/scala/annotation/experimental.scala similarity index 100% rename from library/src-bootstrapped/scala/annotation/experimental.scala rename to library/src/scala/annotation/experimental.scala From 230f8d63e6a0873fd2f0d6ef263149d92cae842d Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 11 Jul 2024 14:56:51 +0200 Subject: [PATCH 3/4] Move scala.runtime.TupledFunctions from `bootstrapped` to shared sources --- .../{src-bootstrapped => src}/scala/runtime/TupledFunctions.scala | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename library/{src-bootstrapped => src}/scala/runtime/TupledFunctions.scala (100%) diff --git a/library/src-bootstrapped/scala/runtime/TupledFunctions.scala b/library/src/scala/runtime/TupledFunctions.scala similarity index 100% rename from library/src-bootstrapped/scala/runtime/TupledFunctions.scala rename to library/src/scala/runtime/TupledFunctions.scala From 120aa1b09d38c12263ad51c684be8c52315bd6a0 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Thu, 11 Jul 2024 14:57:48 +0200 Subject: [PATCH 4/4] Revert bootstrap specificic settings after upgrade of reference version --- project/Build.scala | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 3ec4805a06b6..23a541595d8e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -615,7 +615,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"), @@ -892,8 +892,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 { @@ -921,8 +919,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( @@ -1358,7 +1354,7 @@ object Build { BuildInfoPlugin.buildInfoScopedSettings(Test) ++ BuildInfoPlugin.buildInfoDefaultSettings - def presentationCompilerSettings(implicit mode: Mode) = { + lazy val presentationCompilerSettings = { val mtagsVersion = "1.3.2" Seq( libraryDependencies ++= Seq( @@ -1373,11 +1369,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