diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index ae1217635662..2c499cde100c 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -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() diff --git a/project/Build.scala b/project/Build.scala index 8b4f1ea6c188..b140cf160429 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1263,13 +1263,8 @@ object Build { Compile / javacOptions ++= Seq("--release", Versions.minimumJVMVersion), Compile / scalacOptions ++= Seq("--java-output-version", Versions.minimumJVMVersion), // 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 @@ -1286,7 +1281,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 */ @@ -1316,19 +1311,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 */ @@ -1364,13 +1352,8 @@ object Build { Compile / javacOptions ++= Seq("--release", Versions.minimumJVMVersion), Compile / scalacOptions ++= Seq("--java-output-version", Versions.minimumJVMVersion), // 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 @@ -1416,7 +1399,7 @@ object Build { keepSJSIR := false, // Generate Scala 3 runtime properties overlay Compile / resourceGenerators += generateLibraryProperties.taskValue, - mainClass := None, + Compile /mainClass := None, ) /* Configuration of the org.scala-lang:scala3-library_3:*.**.**-bootstrapped project */ @@ -1448,19 +1431,12 @@ 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", - mainClass := None, + Compile /mainClass := None, ) /* Configuration of the org.scala-js:scalajs-scalalib_2.13:*.**.**-bootstrapped project */ @@ -1510,13 +1486,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 := { @@ -1598,7 +1569,7 @@ object Build { customMimaReportBinaryIssues("MiMaFilters.Scala3Library"), // Should we also patch .sjsir files keepSJSIR := true, - mainClass := None, + Compile / mainClass := None, ) /* Configuration of the org.scala-lang:scala3-library_sjs1_3:*.**.**-bootstrapped project */ @@ -1631,16 +1602,11 @@ 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", - mainClass := None, + Compile / mainClass := None, ) // ==============================================================================================