@@ -617,7 +617,7 @@ object Build {
617617 // Settings shared between scala3-compiler and scala3-compiler-bootstrapped
618618 lazy val commonDottyCompilerSettings = Seq (
619619 // Note: bench/profiles/projects.yml should be updated accordingly.
620- Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" ),
620+ Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" , " -Wsafe-init " ),
621621
622622 // Use source 3.3 to avoid fatal migration warnings on scalajs-ir
623623 scalacOptions ++= Seq (" -source" , " 3.3" ),
@@ -894,8 +894,6 @@ object Build {
894894 }
895895
896896 lazy val nonBootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
897- // FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
898- scalacOptions += " -Ysafe-init" ,
899897 // packageAll packages all and then returns a map with the abs location
900898 packageAll := Def .taskDyn { // Use a dynamic task to avoid loops when loading the settings
901899 Def .task {
@@ -923,8 +921,6 @@ object Build {
923921 )
924922
925923 lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
926- // FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
927- scalacOptions += " -Wsafe-init" ,
928924 javaOptions ++= {
929925 val jars = packageAll.value
930926 Seq (
@@ -1356,7 +1352,7 @@ object Build {
13561352 BuildInfoPlugin .buildInfoScopedSettings(Test ) ++
13571353 BuildInfoPlugin .buildInfoDefaultSettings
13581354
1359- def presentationCompilerSettings ( implicit mode : Mode ) = {
1355+ lazy val presentationCompilerSettings = {
13601356 val mtagsVersion = " 1.3.2"
13611357 Seq (
13621358 libraryDependencies ++= Seq (
@@ -1371,11 +1367,7 @@ object Build {
13711367 ivyConfigurations += SourceDeps .hide,
13721368 transitiveClassifiers := Seq (" sources" ),
13731369 scalacOptions ++= Seq (" -source" , " 3.3" ), // To avoid fatal migration warnings
1374- // FIXME change this to just Seq("-Yexplicit-nulls, "-Wsafe-init") when reference is set to 3.5.0
1375- Compile / scalacOptions ++= (mode match {
1376- case Bootstrapped => Seq (" -Yexplicit-nulls" , " -Wsafe-init" )
1377- case NonBootstrapped => Seq (" -Yexplicit-nulls" , " -Ysafe-init" )
1378- }),
1370+ Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" , " -Wsafe-init" ),
13791371 Compile / sourceGenerators += Def .task {
13801372 val s = streams.value
13811373 val cacheDir = s.cacheDirectory
0 commit comments