Skip to content

Commit 7390c1a

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

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
@@ -1263,13 +1263,8 @@ object Build {
12631263
Compile / javacOptions ++= Seq("--release", Versions.minimumJVMVersion),
12641264
Compile / scalacOptions ++= Seq("--java-output-version", Versions.minimumJVMVersion),
12651265
// Packaging configuration of the stdlib
1266-
Compile / packageBin / publishArtifact := true,
1267-
Compile / packageDoc / publishArtifact := false,
1268-
Compile / packageSrc / publishArtifact := true,
1269-
// Only publish compilation artifacts, no test artifacts
1266+
Compile / publishArtifact := true,
12701267
Test / publishArtifact := false,
1271-
// non-bootstrapped stdlib is publishable (only locally)
1272-
publish / skip := false,
12731268
// Project specific target folder. sbt doesn't like having two projects using the same target folder
12741269
target := target.value / "scala-library-nonbootstrapped",
12751270
// Add configuration for MiMa
@@ -1286,7 +1281,7 @@ object Build {
12861281
keepSJSIR := false,
12871282
// Generate library.properties, used by scala.util.Properties
12881283
Compile / resourceGenerators += generateLibraryProperties.taskValue,
1289-
mainClass := None,
1284+
Compile / mainClass := None,
12901285
)
12911286

12921287
/* Configuration of the org.scala-lang:scala3-library_3:*.**.**-nonbootstrapped project */
@@ -1316,19 +1311,12 @@ object Build {
13161311
Test / doc := (`scala-library-nonbootstrapped` / Test / doc).value,
13171312
Test / run := (`scala-library-nonbootstrapped` / Test / run).evaluated,
13181313
Test / test := (`scala-library-nonbootstrapped` / Test / test).value,
1319-
// Claim that the classes generated by this project are the same as the one we get from `scala-library-nonbootstrapped`
1320-
Compile / classDirectory := (`scala-library-nonbootstrapped` / Compile / classDirectory).value,
13211314
// Packaging configuration of the stdlib
1322-
Compile / packageBin / publishArtifact := true,
1323-
Compile / packageDoc / publishArtifact := false,
1324-
Compile / packageSrc / publishArtifact := true,
1325-
// Only publish compilation artifacts, no test artifacts
1315+
Compile / publishArtifact := true,
13261316
Test / publishArtifact := false,
1327-
// Do not allow to publish this project for now
1328-
publish / skip := false,
13291317
// Project specific target folder. sbt doesn't like having two projects using the same target folder
13301318
target := target.value / "scala3-library-nonbootstrapped",
1331-
mainClass := None,
1319+
Compile / mainClass := None,
13321320
)
13331321

13341322
/* Configuration of the org.scala-lang:scala-library:*.**.**-bootstrapped project */
@@ -1364,13 +1352,8 @@ object Build {
13641352
Compile / javacOptions ++= Seq("--release", Versions.minimumJVMVersion),
13651353
Compile / scalacOptions ++= Seq("--java-output-version", Versions.minimumJVMVersion),
13661354
// Packaging configuration of the stdlib
1367-
Compile / packageBin / publishArtifact := true,
1368-
Compile / packageDoc / publishArtifact := true,
1369-
Compile / packageSrc / publishArtifact := true,
1370-
// Only publish compilation artifacts, no test artifacts
1355+
Compile / publishArtifact := true,
13711356
Test / publishArtifact := false,
1372-
// Do not allow to publish this project for now
1373-
publish / skip := false,
13741357
// Project specific target folder. sbt doesn't like having two projects using the same target folder
13751358
target := target.value / "scala-library-bootstrapped",
13761359
// we do not need sbt to create a managed instance for us, we do it manually in the next setting
@@ -1416,7 +1399,7 @@ object Build {
14161399
keepSJSIR := false,
14171400
// Generate Scala 3 runtime properties overlay
14181401
Compile / resourceGenerators += generateLibraryProperties.taskValue,
1419-
mainClass := None,
1402+
Compile /mainClass := None,
14201403
)
14211404

14221405
/* Configuration of the org.scala-lang:scala3-library_3:*.**.**-bootstrapped project */
@@ -1448,19 +1431,12 @@ object Build {
14481431
Test / compile := (`scala-library-bootstrapped` / Test / compile).value,
14491432
Test / doc := (`scala-library-bootstrapped` / Test / doc).value,
14501433
Test / run := (`scala-library-bootstrapped` / Test / run).evaluated,
1451-
// Claim that the classes generated by this project are the same as the one we get from `scala-library-bootstrapped`
1452-
Compile / classDirectory := (`scala-library-bootstrapped` / Compile / classDirectory).value,
14531434
// Packaging configuration of the stdlib
1454-
Compile / packageBin / publishArtifact := true,
1455-
Compile / packageDoc / publishArtifact := true,
1456-
Compile / packageSrc / publishArtifact := true,
1457-
// Only publish compilation artifacts, no test artifacts
1435+
Compile / publishArtifact := true,
14581436
Test / publishArtifact := false,
1459-
// Do not allow to publish this project for now
1460-
publish / skip := false,
14611437
// Project specific target folder. sbt doesn't like having two projects using the same target folder
14621438
target := target.value / "scala3-library-bootstrapped",
1463-
mainClass := None,
1439+
Compile /mainClass := None,
14641440
)
14651441

14661442
/* Configuration of the org.scala-js:scalajs-scalalib_2.13:*.**.**-bootstrapped project */
@@ -1510,13 +1486,8 @@ object Build {
15101486
}
15111487
},
15121488
// Packaging configuration of the stdlib
1513-
Compile / packageBin / publishArtifact := true,
1514-
Compile / packageDoc / publishArtifact := true,
1515-
Compile / packageSrc / publishArtifact := true,
1516-
// Only publish compilation artifacts, no test artifacts
1489+
Compile / publishArtifact := true,
15171490
Test / publishArtifact := false,
1518-
// Do not allow to publish this project for now
1519-
publish / skip := false,
15201491
// Take into account the source files from the `library` folder
15211492
// but give the priority to the files in `library-js` that override files in `library`
15221493
Compile / sources := {
@@ -1598,7 +1569,7 @@ object Build {
15981569
customMimaReportBinaryIssues("MiMaFilters.Scala3Library"),
15991570
// Should we also patch .sjsir files
16001571
keepSJSIR := true,
1601-
mainClass := None,
1572+
Compile / mainClass := None,
16021573
)
16031574

16041575
/* Configuration of the org.scala-lang:scala3-library_sjs1_3:*.**.**-bootstrapped project */
@@ -1631,16 +1602,11 @@ object Build {
16311602
Test / doc := (`scala-library-sjs` / Test / doc).value,
16321603
Test / run := (`scala-library-sjs` / Test / run).evaluated,
16331604
// Packaging configuration of the stdlib
1634-
Compile / packageBin / publishArtifact := true,
1635-
Compile / packageDoc / publishArtifact := true,
1636-
Compile / packageSrc / publishArtifact := true,
1637-
// Only publish compilation artifacts, no test artifacts
1605+
Compile / publishArtifact := true,
16381606
Test / publishArtifact := false,
1639-
// Do not allow to publish this project for now
1640-
publish / skip := false,
16411607
// Project specific target folder. sbt doesn't like having two projects using the same target folder
16421608
target := target.value / "scala3-library",
1643-
mainClass := None,
1609+
Compile / mainClass := None,
16441610
)
16451611

16461612
// ==============================================================================================

0 commit comments

Comments
 (0)