Skip to content

Commit 393b003

Browse files
authored
Merge pull request #193 from scala/backport-lts-3.3-22401
Backport "Regroup all the library settings in a single function" to 3.3 LTS
2 parents 979d601 + 2dbead6 commit 393b003

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

project/Build.scala

+7-11
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,9 @@ object Build {
959959
}
960960

961961
// Settings shared between scala3-library, scala3-library-bootstrapped and scala3-library-bootstrappedJS
962-
lazy val dottyLibrarySettings = Seq(
962+
def dottyLibrarySettings(implicit mode: Mode) = Seq(
963+
versionScheme := Some("semver-spec"),
964+
libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion,
963965
(Compile / scalacOptions) ++= Seq(
964966
// Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
965967
"-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator),
@@ -2043,16 +2045,9 @@ object Build {
20432045
settings(dottyCompilerSettings)
20442046

20452047
def asDottyLibrary(implicit mode: Mode): Project = {
2046-
val base =
2047-
project.withCommonSettings.
2048-
settings(
2049-
versionScheme := Some("semver-spec"),
2050-
libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion,
2051-
// Make sure we do not refer to experimental features outside an experimental scope.
2052-
// In other words, disable NIGHTLY/SNAPSHOT experimental scope.
2053-
scalacOptions += "-Yno-experimental",
2054-
).
2055-
settings(dottyLibrarySettings)
2048+
val base = project
2049+
.withCommonSettings
2050+
.settings(dottyLibrarySettings)
20562051
if (mode == Bootstrapped) {
20572052
base.settings(
20582053
(Compile/doc) := {
@@ -2111,6 +2106,7 @@ object Build {
21112106
case NonBootstrapped => commonNonBootstrappedSettings
21122107
case Bootstrapped => commonBootstrappedSettings
21132108
})
2109+
21142110
}
21152111

21162112
/* Tests TASTy version invariants during NIGHLY, RC or Stable releases */

0 commit comments

Comments
 (0)