Skip to content

fix: clean up settings in the Build #24714

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

Open
hamzaremmal wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −47
Open

fix: clean up settings in the Build #24714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db76821
fix: clean up settings in the Build
hamzaremmal Dec 9, 2025
f8efd76
disable `scala-collection-compat`
hamzaremmal Dec 12, 2025
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
2 changes: 1 addition & 1 deletion community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class CommunityBuildTestC:
//@Test def protoquill = projects.protoquill.run()
@Test def requests = projects.requests.run()
@Test def scalacheck = projects.scalacheck.run()
@Test def scalaCollectionCompat = projects.scalaCollectionCompat.run()
//@Test def scalaCollectionCompat = projects.scalaCollectionCompat.run()
@Test def scalaJava8Compat = projects.scalaJava8Compat.run()
@Test def scalap = projects.scalap.run()
@Test def scalaParallelCollections = projects.scalaParallelCollections.run()
Expand Down
58 changes: 12 additions & 46 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,13 +1245,8 @@ object Build {
"-sourcepath", (Compile / sourceDirectories).value.map(_.getCanonicalPath).distinct.mkString(File.pathSeparator),
),
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := false,
Compile / packageSrc / publishArtifact := true,
// Only publish compilation artifacts, no test artifacts
Compile / publishArtifact := true,
Test / publishArtifact := false,
// non-bootstrapped stdlib is publishable (only locally)
publish / skip := false,
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala-library-nonbootstrapped",
// Add configuration for MiMa
Expand All @@ -1263,7 +1258,7 @@ object Build {
keepSJSIR := false,
// Generate library.properties, used by scala.util.Properties
Compile / resourceGenerators += generateLibraryProperties.taskValue,
mainClass := None,
Compile / mainClass := None,
)

/* Configuration of the org.scala-lang:scala3-library_3:*.**.**-nonbootstrapped project */
Expand Down Expand Up @@ -1293,19 +1288,12 @@ object Build {
Test / doc := (`scala-library-nonbootstrapped` / Test / doc).value,
Test / run := (`scala-library-nonbootstrapped` / Test / run).evaluated,
Test / test := (`scala-library-nonbootstrapped` / Test / test).value,
// Claim that the classes generated by this project are the same as the one we get from `scala-library-nonbootstrapped`
Compile / classDirectory := (`scala-library-nonbootstrapped` / Compile / classDirectory).value,
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := false,
Compile / packageSrc / publishArtifact := true,
// Only publish compilation artifacts, no test artifacts
Compile / publishArtifact := true,
Test / publishArtifact := false,
// Do not allow to publish this project for now
publish / skip := false,
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala3-library-nonbootstrapped",
mainClass := None,
Compile / mainClass := None,
)

/* Configuration of the org.scala-lang:scala-library:*.**.**-bootstrapped project */
Expand Down Expand Up @@ -1335,13 +1323,8 @@ object Build {
"-sourcepath", (Compile / sourceDirectories).value.map(_.getCanonicalPath).distinct.mkString(File.pathSeparator),
),
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := true,
Compile / packageSrc / publishArtifact := true,
// Only publish compilation artifacts, no test artifacts
Compile / publishArtifact := true,
Test / publishArtifact := false,
// Do not allow to publish this project for now
publish / skip := false,
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala-library-bootstrapped",
// we do not need sbt to create a managed instance for us, we do it manually in the next setting
Expand Down Expand Up @@ -1383,7 +1366,7 @@ object Build {
// Generate Scala 3 runtime properties overlay
Compile / resourceGenerators += generateLibraryProperties.taskValue,
bspEnabled := enableBspAllProjects,
mainClass := None,
Compile / mainClass := None,
)

/* Configuration of the org.scala-lang:scala3-library_3:*.**.**-bootstrapped project */
Expand Down Expand Up @@ -1415,20 +1398,13 @@ object Build {
Test / compile := (`scala-library-bootstrapped` / Test / compile).value,
Test / doc := (`scala-library-bootstrapped` / Test / doc).value,
Test / run := (`scala-library-bootstrapped` / Test / run).evaluated,
// Claim that the classes generated by this project are the same as the one we get from `scala-library-bootstrapped`
Compile / classDirectory := (`scala-library-bootstrapped` / Compile / classDirectory).value,
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := true,
Compile / packageSrc / publishArtifact := true,
// Only publish compilation artifacts, no test artifacts
Compile / publishArtifact := true,
Test / publishArtifact := false,
// Do not allow to publish this project for now
publish / skip := false,
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala3-library-bootstrapped",
bspEnabled := enableBspAllProjects,
mainClass := None,
Compile / mainClass := None,
)

/* Configuration of the org.scala-js:scalajs-scalalib_2.13:*.**.**-bootstrapped project */
Expand Down Expand Up @@ -1474,13 +1450,8 @@ object Build {
}
},
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := true,
Compile / packageSrc / publishArtifact := true,
// Only publish compilation artifacts, no test artifacts
Compile / publishArtifact := true,
Test / publishArtifact := false,
// Do not allow to publish this project for now
publish / skip := false,
// Take into account the source files from the `library` folder
// but give the priority to the files in `library-js` that override files in `library`
Compile / sources := {
Expand Down Expand Up @@ -1558,7 +1529,7 @@ object Build {
// Should we also patch .sjsir files
keepSJSIR := true,
bspEnabled := false,
mainClass := None,
Compile / mainClass := None,
)

/* Configuration of the org.scala-lang:scala3-library_sjs1_3:*.**.**-bootstrapped project */
Expand Down Expand Up @@ -1591,17 +1562,12 @@ object Build {
Test / doc := (`scala-library-sjs` / Test / doc).value,
Test / run := (`scala-library-sjs` / Test / run).evaluated,
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := true,
Compile / packageSrc / publishArtifact := true,
// Only publish compilation artifacts, no test artifacts
Compile / publishArtifact := true,
Test / publishArtifact := false,
// Do not allow to publish this project for now
publish / skip := false,
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala3-library",
bspEnabled := false,
mainClass := None,
Compile / mainClass := None,
)

// ==============================================================================================
Expand Down
Loading