Skip to content

Commit f4bd43a

Browse files
committed
Add TASTy-MiMa to stdlib-bootstrapped
1 parent d332059 commit f4bd43a

File tree

5 files changed

+334
-3
lines changed

5 files changed

+334
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253

254254
- name: MiMa
255255
run: |
256-
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; stdlib-bootstrapped/mimaReportBinaryIssues"
256+
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; stdlib-bootstrapped/mimaReportBinaryIssues stdlib-bootstrapped/tastyMiMaReportIssues"
257257
258258
community_build_a:
259259
runs-on: [self-hosted, Linux]

project/Build.scala

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import org.scalajs.sbtplugin.ScalaJSPlugin
2121
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
2222
import sbtbuildinfo.BuildInfoPlugin
2323
import sbtbuildinfo.BuildInfoPlugin.autoImport._
24+
import sbttastymima.TastyMiMaPlugin
25+
import sbttastymima.TastyMiMaPlugin.autoImport._
2426

2527
import scala.util.Properties.isJavaAtLeast
2628
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
@@ -994,6 +996,19 @@ object Build {
994996
"scala.annotation.specialized",
995997
"scala.annotation.unspecialized",
996998
),
999+
tastyMiMaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped),
1000+
// tastyMiMaPreviousClasspaths := {
1001+
// val (cp, entry) = tastyMiMaCurrentClasspath.value
1002+
// Seq(("org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped), cp, entry))
1003+
// },
1004+
tastyMiMaCurrentClasspath := {
1005+
val javaBootCp = tastyMiMaJavaBootClasspath.value
1006+
val classDir = (Compile / classDirectory).value.toPath()
1007+
val cp0 = Attributed.data((Compile / fullClasspath).value).map(_.toPath())
1008+
val cp: Seq[Path] = classDir +: (javaBootCp ++ cp0)
1009+
(cp, classDir)
1010+
},
1011+
tastyMiMaConfig ~= { _.withMoreProblemFilters(TastyMiMaFilters.StdlibBootstrapped) },
9971012
// TODO package only TASTy files.
9981013
// We first need to check that a project can depend on a JAR that only contains TASTy files.
9991014
// Compile / exportJars := true,

0 commit comments

Comments
 (0)