Skip to content

Commit fe6cf02

Browse files
committed
Migrated to scalaOutputVersion
1 parent b58dd04 commit fe6cf02

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,6 @@ qbin
4040
# Mac specific, but that is common enough a dev platform to warrant inclusion.
4141
.DS_Store
4242

43-
target/
43+
target/
44+
45+
.bsp/

build.sbt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,17 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3535
.settings(
3636
name := "scala-xml",
3737
scalaModuleAutomaticModuleName := Some("scala.xml"),
38-
crossScalaVersions := Seq("2.13.8", "2.12.15", "3.0.2", "3.1.2"),
38+
crossScalaVersions := Seq("2.13.8", "2.12.15", "3.1.2"),
3939
scalaVersion := "2.12.15",
4040

41-
// Don't publish for Scala 3.1 or later, only from 3.0
42-
publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {
43-
case Some((3, x)) if x > 0 => true
44-
case _ => false
45-
}),
41+
scalaOutputVersion := {
42+
CrossVersion.partialVersion(scalaVersion.value) match {
43+
case Some((3, _)) => "3.0.2"
44+
case _ => scalaVersion.value
45+
}
46+
},
47+
48+
publish / skip := false,
4649

4750
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
4851
case Some((3, _)) =>

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.0-M2

0 commit comments

Comments
 (0)