Skip to content

Commit a227106

Browse files
authored
[chore] fix: clean up settings in the Build (#24714)
Remove `classDirectory` from `scala3-library-*` projects and some cleanups of the settings. Closes #24703
1 parent f67a1a0 commit a227106

File tree

2 files changed

+13
-47
lines changed

2 files changed

+13
-47
lines changed

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class CommunityBuildTestC:
8282
//@Test def protoquill = projects.protoquill.run()
8383
@Test def requests = projects.requests.run()
8484
@Test def scalacheck = projects.scalacheck.run()
85-
@Test def scalaCollectionCompat = projects.scalaCollectionCompat.run()
85+
//@Test def scalaCollectionCompat = projects.scalaCollectionCompat.run()
8686
@Test def scalaJava8Compat = projects.scalaJava8Compat.run()
8787
@Test def scalap = projects.scalap.run()
8888
@Test def scalaParallelCollections = projects.scalaParallelCollections.run()

project/Build.scala

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,13 +1245,8 @@ object Build {
12451245
"-sourcepath", (Compile / sourceDirectories).value.map(_.getCanonicalPath).distinct.mkString(File.pathSeparator),
12461246
),
12471247
// Packaging configuration of the stdlib
1248-
Compile / packageBin / publishArtifact := true,
1249-
Compile / packageDoc / publishArtifact := false,
1250-
Compile / packageSrc / publishArtifact := true,
1251-
// Only publish compilation artifacts, no test artifacts
1248+
Compile / publishArtifact := true,
12521249
Test / publishArtifact := false,
1253-
// non-bootstrapped stdlib is publishable (only locally)
1254-
publish / skip := false,
12551250
// Project specific target folder. sbt doesn't like having two projects using the same target folder
12561251
target := target.value / "scala-library-nonbootstrapped",
12571252
// Add configuration for MiMa
@@ -1263,7 +1258,7 @@ object Build {
12631258
keepSJSIR := false,
12641259
// Generate library.properties, used by scala.util.Properties
12651260
Compile / resourceGenerators += generateLibraryProperties.taskValue,
1266-
mainClass := None,
1261+
Compile / mainClass := None,
12671262
)
12681263

12691264
/* Configuration of the org.scala-lang:scala3-library_3:*.**.**-nonbootstrapped project */
@@ -1293,19 +1288,12 @@ object Build {
12931288
Test / doc := (`scala-library-nonbootstrapped` / Test / doc).value,
12941289
Test / run := (`scala-library-nonbootstrapped` / Test / run).evaluated,
12951290
Test / test := (`scala-library-nonbootstrapped` / Test / test).value,
1296-
// Claim that the classes generated by this project are the same as the one we get from `scala-library-nonbootstrapped`
1297-
Compile / classDirectory := (`scala-library-nonbootstrapped` / Compile / classDirectory).value,
12981291
// Packaging configuration of the stdlib
1299-
Compile / packageBin / publishArtifact := true,
1300-
Compile / packageDoc / publishArtifact := false,
1301-
Compile / packageSrc / publishArtifact := true,
1302-
// Only publish compilation artifacts, no test artifacts
1292+
Compile / publishArtifact := true,
13031293
Test / publishArtifact := false,
1304-
// Do not allow to publish this project for now
1305-
publish / skip := false,
13061294
// Project specific target folder. sbt doesn't like having two projects using the same target folder
13071295
target := target.value / "scala3-library-nonbootstrapped",
1308-
mainClass := None,
1296+
Compile / mainClass := None,
13091297
)
13101298

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

13891372
/* Configuration of the org.scala-lang:scala3-library_3:*.**.**-bootstrapped project */
@@ -1415,20 +1398,13 @@ object Build {
14151398
Test / compile := (`scala-library-bootstrapped` / Test / compile).value,
14161399
Test / doc := (`scala-library-bootstrapped` / Test / doc).value,
14171400
Test / run := (`scala-library-bootstrapped` / Test / run).evaluated,
1418-
// Claim that the classes generated by this project are the same as the one we get from `scala-library-bootstrapped`
1419-
Compile / classDirectory := (`scala-library-bootstrapped` / Compile / classDirectory).value,
14201401
// Packaging configuration of the stdlib
1421-
Compile / packageBin / publishArtifact := true,
1422-
Compile / packageDoc / publishArtifact := true,
1423-
Compile / packageSrc / publishArtifact := true,
1424-
// Only publish compilation artifacts, no test artifacts
1402+
Compile / publishArtifact := true,
14251403
Test / publishArtifact := false,
1426-
// Do not allow to publish this project for now
1427-
publish / skip := false,
14281404
// Project specific target folder. sbt doesn't like having two projects using the same target folder
14291405
target := target.value / "scala3-library-bootstrapped",
14301406
bspEnabled := enableBspAllProjects,
1431-
mainClass := None,
1407+
Compile / mainClass := None,
14321408
)
14331409

14341410
/* Configuration of the org.scala-js:scalajs-scalalib_2.13:*.**.**-bootstrapped project */
@@ -1474,13 +1450,8 @@ object Build {
14741450
}
14751451
},
14761452
// Packaging configuration of the stdlib
1477-
Compile / packageBin / publishArtifact := true,
1478-
Compile / packageDoc / publishArtifact := true,
1479-
Compile / packageSrc / publishArtifact := true,
1480-
// Only publish compilation artifacts, no test artifacts
1453+
Compile / publishArtifact := true,
14811454
Test / publishArtifact := false,
1482-
// Do not allow to publish this project for now
1483-
publish / skip := false,
14841455
// Take into account the source files from the `library` folder
14851456
// but give the priority to the files in `library-js` that override files in `library`
14861457
Compile / sources := {
@@ -1558,7 +1529,7 @@ object Build {
15581529
// Should we also patch .sjsir files
15591530
keepSJSIR := true,
15601531
bspEnabled := false,
1561-
mainClass := None,
1532+
Compile / mainClass := None,
15621533
)
15631534

15641535
/* Configuration of the org.scala-lang:scala3-library_sjs1_3:*.**.**-bootstrapped project */
@@ -1591,17 +1562,12 @@ object Build {
15911562
Test / doc := (`scala-library-sjs` / Test / doc).value,
15921563
Test / run := (`scala-library-sjs` / Test / run).evaluated,
15931564
// Packaging configuration of the stdlib
1594-
Compile / packageBin / publishArtifact := true,
1595-
Compile / packageDoc / publishArtifact := true,
1596-
Compile / packageSrc / publishArtifact := true,
1597-
// Only publish compilation artifacts, no test artifacts
1565+
Compile / publishArtifact := true,
15981566
Test / publishArtifact := false,
1599-
// Do not allow to publish this project for now
1600-
publish / skip := false,
16011567
// Project specific target folder. sbt doesn't like having two projects using the same target folder
16021568
target := target.value / "scala3-library",
16031569
bspEnabled := false,
1604-
mainClass := None,
1570+
Compile / mainClass := None,
16051571
)
16061572

16071573
// ==============================================================================================

0 commit comments

Comments
 (0)