From 34339ab8f0d4bcc43451eccf1c0682fe8449d737 Mon Sep 17 00:00:00 2001 From: Hamza Remmal Date: Thu, 20 Nov 2025 18:03:48 +0100 Subject: [PATCH 1/2] do not emit jar files for the legacy artifacts --- project/Build.scala | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 9fc41203f816..48a8a018c3e6 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1257,14 +1257,12 @@ object Build { 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 + // This artifact is a legacy that only exists to evict projects + // that depends on it to the newer version and the new artifact. + // As such, it is published only as a `pom` and it has no `jar`. + publishMavenStyle := true, + Compile / publishArtifact := false, 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", ) @@ -1378,14 +1376,12 @@ object Build { 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 := false, - Compile / packageSrc / publishArtifact := true, - // Only publish compilation artifacts, no test artifacts + // This artifact is a legacy that only exists to evict projects + // that depends on it to the newer version and the new artifact. + // As such, it is published only as a `pom` and it has no `jar`. + publishMavenStyle := true, + Compile / publishArtifact := false, 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 := false, @@ -1549,14 +1545,12 @@ object Build { Test / compile := (`scala-library-sjs` / Test / compile).value, 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 := false, - Compile / packageSrc / publishArtifact := true, - // Only publish compilation artifacts, no test artifacts + // This artifact is a legacy that only exists to evict projects + // that depends on it to the newer version and the new artifact. + // As such, it is published only as a `pom` and it has no `jar`. + publishMavenStyle := true, + Compile / publishArtifact := false, 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, From 2b19933bdea18cb93553bfae4ac605c201b0036f Mon Sep 17 00:00:00 2001 From: Hamza Remmal Date: Tue, 25 Nov 2025 13:25:24 +0100 Subject: [PATCH 2/2] chore: bump sbt to 1.12.0-M2 --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index a5c482a9a339..39e8ae44bcbb 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -114,7 +114,7 @@ final case class SbtCommunityProject( val sbtProps = Option(System.getProperty("sbt.ivy.home")) match case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil - extraSbtArgs ++ sbtProps ++ List("-sbt-version", "1.11.5", "-Dsbt.supershell=false", s"--addPluginSbtFile=$sbtPluginFilePath") + extraSbtArgs ++ sbtProps ++ List("-sbt-version", "1.12.0-M2", "-Dsbt.supershell=false", s"--addPluginSbtFile=$sbtPluginFilePath") object SbtCommunityProject: def scalacOptions = List( diff --git a/project/build.properties b/project/build.properties index e480c675f2fd..53e28f4edf14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.5 +sbt.version=1.12.0-M2