@@ -1240,11 +1240,6 @@ object Build {
1240
1240
.dependsOn(`scala-library-internal-tasty` % " provided" , `scala-library-internal` % " provided" )
1241
1241
.settings(scala2LibraryBootstrappedSettings)
1242
1242
.settings(moduleName := " scala2-library" )
1243
- .settings(
1244
- (Compile / packageBin / mappings) ++= (`scala-library-internal` / Compile / packageBin / mappings).value,
1245
- (Compile / packageBin / mappings) ++= (`scala-library-internal-tasty` / Compile / packageBin / mappings).value,
1246
- mimaCurrentClassfiles := (Compile / packageBin).value,
1247
- )
1248
1243
1249
1244
// -Ycheck:all is set in project/scripts/scala2-library-tasty-mima.sh
1250
1245
@@ -1258,11 +1253,6 @@ object Build {
1258
1253
.dependsOn(`scala-library-internal-tasty` % " provided" , `scala-library-internal` % " provided" )
1259
1254
.settings(scala2LibraryBootstrappedSettings)
1260
1255
.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
- )
1266
1256
1267
1257
lazy val scala2LibraryBootstrappedSettings = Seq (
1268
1258
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
@@ -1353,10 +1343,13 @@ object Build {
1353
1343
(Test / managedClasspath) ~= {
1354
1344
_.filterNot(file => file.data.getName == s " scala-library- $stdlibBootstrappedVersion.jar " )
1355
1345
},
1346
+ (Compile / packageBin / mappings) ++= (`scala-library-internal` / Compile / packageBin / mappings).value,
1347
+ (Compile / packageBin / mappings) ++= (`scala-library-internal-tasty` / Compile / packageBin / mappings).value,
1356
1348
mimaCheckDirection := " both" ,
1357
1349
mimaBackwardIssueFilters := Scala2LibraryBootstrappedMiMaFilters .BackwardsBreakingChanges ,
1358
1350
mimaForwardIssueFilters := Scala2LibraryBootstrappedMiMaFilters .ForwardsBreakingChanges ,
1359
1351
customMimaReportBinaryIssues(" Scala2LibraryBootstrappedMiMaFilters" ),
1352
+ mimaCurrentClassfiles := (Compile / packageBin).value,
1360
1353
mimaPreviousArtifacts += " org.scala-lang" % " scala-library" % stdlibBootstrappedVersion,
1361
1354
mimaExcludeAnnotations ++= Seq (
1362
1355
" scala.annotation.experimental" ,
@@ -1367,8 +1360,8 @@ object Build {
1367
1360
tastyMiMaPreviousArtifacts += " org.scala-lang" % " scala-library" % stdlibBootstrappedVersion,
1368
1361
tastyMiMaCurrentClasspath := {
1369
1362
val javaBootCp = tastyMiMaJavaBootClasspath.value
1370
- val classDir = (Compile / classDirectory ).value.toPath()
1371
- val cp0 = Attributed .data((Compile / fullClasspath).value).map(_.toPath())
1363
+ val classDir = (Compile / packageBin ).value.toPath()
1364
+ val cp0 = Attributed .data((Compile / fullClasspath).value).map(_.toPath()).filterNot(_.toString().contains( " library-internal " ))
1372
1365
val cp : Seq [Path ] = classDir +: (javaBootCp ++ cp0)
1373
1366
(cp, classDir)
1374
1367
},
0 commit comments