@@ -615,7 +615,7 @@ object Build {
615
615
// Settings shared between scala3-compiler and scala3-compiler-bootstrapped
616
616
lazy val commonDottyCompilerSettings = Seq (
617
617
// Note: bench/profiles/projects.yml should be updated accordingly.
618
- Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" ),
618
+ Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" , " -Wsafe-init " ),
619
619
620
620
// Use source 3.3 to avoid fatal migration warnings on scalajs-ir
621
621
scalacOptions ++= Seq (" -source" , " 3.3" ),
@@ -892,8 +892,6 @@ object Build {
892
892
}
893
893
894
894
lazy val nonBootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
895
- // FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
896
- scalacOptions += " -Ysafe-init" ,
897
895
// packageAll packages all and then returns a map with the abs location
898
896
packageAll := Def .taskDyn { // Use a dynamic task to avoid loops when loading the settings
899
897
Def .task {
@@ -921,8 +919,6 @@ object Build {
921
919
)
922
920
923
921
lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
924
- // FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
925
- scalacOptions += " -Wsafe-init" ,
926
922
javaOptions ++= {
927
923
val jars = packageAll.value
928
924
Seq (
@@ -1358,7 +1354,7 @@ object Build {
1358
1354
BuildInfoPlugin .buildInfoScopedSettings(Test ) ++
1359
1355
BuildInfoPlugin .buildInfoDefaultSettings
1360
1356
1361
- def presentationCompilerSettings ( implicit mode : Mode ) = {
1357
+ lazy val presentationCompilerSettings = {
1362
1358
val mtagsVersion = " 1.3.2"
1363
1359
Seq (
1364
1360
libraryDependencies ++= Seq (
@@ -1373,11 +1369,7 @@ object Build {
1373
1369
ivyConfigurations += SourceDeps .hide,
1374
1370
transitiveClassifiers := Seq (" sources" ),
1375
1371
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" ),
1381
1373
Compile / sourceGenerators += Def .task {
1382
1374
val s = streams.value
1383
1375
val cacheDir = s.cacheDirectory
0 commit comments