Skip to content

Commit b1f5dad

Browse files
hamzaremmalsjrd
authored andcommitted
chore: adapt tastyMiMa to not add library-internal in the cp
1 parent 5b2ae84 commit b1f5dad

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

project/Build.scala

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,11 +1240,6 @@ object Build {
12401240
.dependsOn(`scala-library-internal-tasty` % "provided", `scala-library-internal` % "provided")
12411241
.settings(scala2LibraryBootstrappedSettings)
12421242
.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-
)
12481243

12491244
// -Ycheck:all is set in project/scripts/scala2-library-tasty-mima.sh
12501245

@@ -1258,11 +1253,6 @@ object Build {
12581253
.dependsOn(`scala-library-internal-tasty` % "provided", `scala-library-internal` % "provided")
12591254
.settings(scala2LibraryBootstrappedSettings)
12601255
.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-
)
12661256

12671257
lazy val scala2LibraryBootstrappedSettings = Seq(
12681258
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
@@ -1353,10 +1343,13 @@ object Build {
13531343
(Test / managedClasspath) ~= {
13541344
_.filterNot(file => file.data.getName == s"scala-library-$stdlibBootstrappedVersion.jar")
13551345
},
1346+
(Compile / packageBin / mappings) ++= (`scala-library-internal` / Compile / packageBin / mappings).value,
1347+
(Compile / packageBin / mappings) ++= (`scala-library-internal-tasty` / Compile / packageBin / mappings).value,
13561348
mimaCheckDirection := "both",
13571349
mimaBackwardIssueFilters := Scala2LibraryBootstrappedMiMaFilters.BackwardsBreakingChanges,
13581350
mimaForwardIssueFilters := Scala2LibraryBootstrappedMiMaFilters.ForwardsBreakingChanges,
13591351
customMimaReportBinaryIssues("Scala2LibraryBootstrappedMiMaFilters"),
1352+
mimaCurrentClassfiles := (Compile / packageBin).value,
13601353
mimaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibBootstrappedVersion,
13611354
mimaExcludeAnnotations ++= Seq(
13621355
"scala.annotation.experimental",
@@ -1367,8 +1360,8 @@ object Build {
13671360
tastyMiMaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibBootstrappedVersion,
13681361
tastyMiMaCurrentClasspath := {
13691362
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"))
13721365
val cp: Seq[Path] = classDir +: (javaBootCp ++ cp0)
13731366
(cp, classDir)
13741367
},

0 commit comments

Comments
 (0)