Skip to content

Commit cb6005b

Browse files
authored
Merge pull request #524 from JD557/native-scala3
2 parents e7b9471 + c61ce2b commit cb6005b

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

build.sbt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ lazy val root = project
3232
compat213Native,
3333
compat30JVM,
3434
compat30JS,
35+
compat31Native,
3536
scalafixData211,
3637
scalafixData212,
3738
scalafixData213,
@@ -53,6 +54,7 @@ lazy val scala211 = "2.11.12"
5354
lazy val scala212 = "2.12.15"
5455
lazy val scala213 = "2.13.8"
5556
lazy val scala30 = "3.0.2"
57+
lazy val scala31 = "3.1.1"
5658

5759
lazy val compat = new MultiScalaCrossProject(
5860
"compat",
@@ -116,6 +118,10 @@ lazy val compat = new MultiScalaCrossProject(
116118
addCompilerPlugin(
117119
"org.scala-native" % "junit-plugin" % nativeVersion cross CrossVersion.full
118120
),
121+
mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
122+
case Some((3, 1)) => mimaPreviousArtifacts.value.filter(_.revision != "2.6.0")
123+
case _ => mimaPreviousArtifacts.value
124+
}),
119125
libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion,
120126
Test / fork := false // Scala Native cannot run forked tests
121127
)
@@ -125,6 +131,7 @@ val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
125131
val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
126132
val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
127133
val compat30 = compat(Seq(JSPlatform, JVMPlatform), scala30)
134+
val compat31 = compat(Seq(JVMPlatform, NativePlatform), scala31)
128135

129136
lazy val compat211JVM = compat211.jvm
130137
lazy val compat211JS = compat211.js
@@ -137,6 +144,7 @@ lazy val compat213JS = compat213.js
137144
lazy val compat213Native = compat213.native
138145
lazy val compat30JVM = compat30.jvm
139146
lazy val compat30JS = compat30.js
147+
lazy val compat31Native = compat31.native
140148

141149
lazy val binaryCompatOld = project
142150
.in(file("binary-compat/old"))

0 commit comments

Comments
 (0)