@@ -38,12 +38,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
38
38
crossScalaVersions := Seq (" 2.13.8" , " 2.12.16" , " 3.1.3" ),
39
39
scalaVersion := " 2.12.16" ,
40
40
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
-
47
41
scalacOptions ++= (CrossVersion .partialVersion(scalaVersion.value) match {
48
42
case Some ((3 , _)) =>
49
43
Seq (" -language:Scala2" )
@@ -161,20 +155,4 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
161
155
s " -Xplugin: $jarPath"
162
156
},
163
157
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) },
173
158
)
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