Skip to content

Regroup all the library settings in a single function #22401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Regroup all the library settings in a single function #22401

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,9 @@ object Build {
}

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

def asDottyLibrary(implicit mode: Mode): Project = {
val base =
project.withCommonSettings.
settings(
versionScheme := Some("semver-spec"),
libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion,
).
settings(dottyLibrarySettings)
val base = project
.withCommonSettings
.settings(dottyLibrarySettings)
if (mode == Bootstrapped) {
base.settings(
(Compile/doc) := {
Expand Down Expand Up @@ -2505,6 +2503,7 @@ object Build {
case NonBootstrapped => commonNonBootstrappedSettings
case Bootstrapped => commonBootstrappedSettings
})

}

/* Tests TASTy version invariants during NIGHLY, RC or Stable releases */
Expand Down
Loading