Skip to content

Commit 8d8e95c

Browse files
committed
chore: use library-internal-cc in scala2-bootstrap libraries
1 parent 2e8356f commit 8d8e95c

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

project/Build.scala

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,11 +1234,12 @@ object Build {
12341234
*
12351235
* This version of the library is not (yet) TASTy/binary compatible with the Scala 2 compiled library.
12361236
*/
1237-
lazy val `scala2-library-bootstrapped` = project.in(file("scala2-library-bootstrapped")).
1238-
withCommonSettings(Bootstrapped).
1239-
dependsOn(`scala-library-internal` % "provided", dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
1240-
settings(scala2LibraryBootstrappedSettings).
1241-
settings(moduleName := "scala2-library")
1237+
lazy val `scala2-library-bootstrapped` = project.in(file("scala2-library-bootstrapped"))
1238+
.withCommonSettings(Bootstrapped)
1239+
.dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test")
1240+
.dependsOn(`scala-library-internal-tasty` % "provided", `scala-library-internal` % "provided")
1241+
.settings(scala2LibraryBootstrappedSettings)
1242+
.settings(moduleName := "scala2-library")
12421243
.settings(
12431244
(Compile / packageBin / mappings) ++= (`scala-library-internal` / Compile / packageBin / mappings).value,
12441245
(Compile / packageBin / mappings) ++= (`scala-library-internal-tasty` / Compile / packageBin / mappings).value,
@@ -1251,11 +1252,17 @@ object Build {
12511252
*
12521253
* This version of the library is not (yet) TASTy/binary compatible with the Scala 2 compiled library.
12531254
*/
1254-
lazy val `scala2-library-cc` = project.in(file("scala2-library-cc")).
1255-
withCommonSettings(Bootstrapped).
1256-
dependsOn(`scala-library-internal` % "provided", dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
1257-
settings(scala2LibraryBootstrappedSettings).
1258-
settings(moduleName := "scala2-library-cc")
1255+
lazy val `scala2-library-cc` = project.in(file("scala2-library-cc"))
1256+
.withCommonSettings(Bootstrapped)
1257+
.dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test")
1258+
.dependsOn(`scala-library-internal-tasty` % "provided", `scala-library-internal` % "provided")
1259+
.settings(scala2LibraryBootstrappedSettings)
1260+
.settings(moduleName := "scala2-library-cc")
1261+
.settings(
1262+
(Compile / packageBin / mappings) ++= (`scala-library-internal` / Compile / packageBin / mappings).value,
1263+
(Compile / packageBin / mappings) ++= (`scala-library-internal-tasty` / Compile / packageBin / mappings).value,
1264+
mimaCurrentClassfiles := (Compile / packageBin).value,
1265+
)
12591266

12601267
lazy val scala2LibraryBootstrappedSettings = Seq(
12611268
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
@@ -1264,7 +1271,7 @@ object Build {
12641271
},
12651272
Compile / doc / scalacOptions += "-Ydocument-synthetic-types",
12661273
scalacOptions += "-Ycompile-scala2-library",
1267-
//scalacOptions += "-Yscala2-unpickler:never",
1274+
scalacOptions += "-Yscala2-unpickler:never",
12681275
scalacOptions += "-Werror:false",
12691276
Compile / compile / logLevel.withRank(KeyRanks.Invisible) := Level.Error,
12701277
ivyConfigurations += SourceDeps.hide,

0 commit comments

Comments
 (0)