Skip to content

Commit 120aa1b

Browse files
committed
Revert bootstrap specificic settings after upgrade of reference version
1 parent 230f8d6 commit 120aa1b

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

project/Build.scala

+3-11
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ object Build {
615615
// Settings shared between scala3-compiler and scala3-compiler-bootstrapped
616616
lazy val commonDottyCompilerSettings = Seq(
617617
// Note: bench/profiles/projects.yml should be updated accordingly.
618-
Compile / scalacOptions ++= Seq("-Yexplicit-nulls"),
618+
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),
619619

620620
// Use source 3.3 to avoid fatal migration warnings on scalajs-ir
621621
scalacOptions ++= Seq("-source", "3.3"),
@@ -892,8 +892,6 @@ object Build {
892892
}
893893

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

923921
lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
924-
// FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
925-
scalacOptions += "-Wsafe-init",
926922
javaOptions ++= {
927923
val jars = packageAll.value
928924
Seq(
@@ -1358,7 +1354,7 @@ object Build {
13581354
BuildInfoPlugin.buildInfoScopedSettings(Test) ++
13591355
BuildInfoPlugin.buildInfoDefaultSettings
13601356

1361-
def presentationCompilerSettings(implicit mode: Mode) = {
1357+
lazy val presentationCompilerSettings = {
13621358
val mtagsVersion = "1.3.2"
13631359
Seq(
13641360
libraryDependencies ++= Seq(
@@ -1373,11 +1369,7 @@ object Build {
13731369
ivyConfigurations += SourceDeps.hide,
13741370
transitiveClassifiers := Seq("sources"),
13751371
scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings
1376-
// FIXME change this to just Seq("-Yexplicit-nulls, "-Wsafe-init") when reference is set to 3.5.0
1377-
Compile / scalacOptions ++= (mode match {
1378-
case Bootstrapped => Seq("-Yexplicit-nulls", "-Wsafe-init")
1379-
case NonBootstrapped => Seq("-Yexplicit-nulls", "-Ysafe-init")
1380-
}),
1372+
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),
13811373
Compile / sourceGenerators += Def.task {
13821374
val s = streams.value
13831375
val cacheDir = s.cacheDirectory

0 commit comments

Comments
 (0)