Skip to content

Commit 22b67ef

Browse files
committed
fix Scala 3 publishing
sequel to #615
1 parent 354cd71 commit 22b67ef

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

build.sbt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3838
crossScalaVersions := Seq("2.13.8", "2.12.16", "3.1.3"),
3939
scalaVersion := "2.12.16",
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-
}),
46-
4741
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
4842
case Some((3, _)) =>
4943
Seq("-language:Scala2")
@@ -161,20 +155,4 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
161155
s"-Xplugin:$jarPath"
162156
},
163157
Test / testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-s", "-v"),
164-
// Scala Native doesn't support Scala 3.0
165-
Compile / nativeLink := { if(isScala30(scalaVersion.value)) null else (Compile / nativeLink).value },
166-
Test / nativeLink := { if(isScala30(scalaVersion.value)) null else (Test / nativeLink).value },
167-
Test / test := { if(isScala30(scalaVersion.value)) {} else (Test / test).value },
168-
Compile / sources := { if(isScala30(scalaVersion.value)) Nil else (Compile / sources).value },
169-
Test / sources := { if(isScala30(scalaVersion.value)) Nil else (Test / sources).value },
170-
libraryDependencies := { if(isScala30(scalaVersion.value)) Nil else libraryDependencies.value },
171-
Test / scalacOptions := { if(isScala30(scalaVersion.value)) Nil else (Test / scalacOptions).value },
172-
publish / skip := { isScala30(scalaVersion.value) },
173158
)
174-
175-
def isScala30(scalaVersion: String) = {
176-
CrossVersion.partialVersion(scalaVersion) match {
177-
case Some((3, 0)) => true
178-
case _ => false
179-
}
180-
}

0 commit comments

Comments
 (0)