adjust build to 1.x branch

Author: lrytz

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
 fail-fast: false
 matrix:
 java: [8, 11, 17]
-scala: [2.12.x, 2.13.x, 3.x]
+scala: [2.11.x, 2.12.x, 2.13.x]
 runs-on: ubuntu-latest
 steps:
  - uses: actions/checkout@v2
@@ -22,4 +22,4 @@ jobs:
 java-version: ${{matrix.java}}
 cache: sbt
  - name: Test
-run: sbt ++${{matrix.scala}} test headerCheck versionPolicyCheck package
+run: sbt ++${{matrix.scala}} test versionPolicyCheck package

.travis.yml

@@ -14,20 +14,14 @@ lazy val configSettings: Seq[Setting[?]] = Seq(
  unmanagedSourceDirectories.value.flatMap{dir =>
 defforVersion(version: String):File= file(dir.getPath ++"-"++ version)
 CrossVersion.partialVersion(scalaVersion.value) match{
-caseSome((3, _)) =>Seq(forVersion("3"), forVersion("2.13+"))
-caseSome((2, minor)) =>
-Seq(forVersion("2")) ++ (minor match{
-case13=>Seq(forVersion("2.13"), forVersion("2.13+"))
-case12=>Seq(forVersion("2.12"))
-case _ =>Seq()
- })
-case _ =>Seq()
+caseSome((2, 13)) =>Seq(forVersion("2.13"))
+case _ =>Seq(forVersion("2.11-2.12"))
  }
  }
  }
 )
 
-lazyvalxml= crossProject(JSPlatform, JVMPlatform, NativePlatform)
+lazyvalxml= crossProject(JSPlatform, JVMPlatform)
  .withoutSuffixFor(JVMPlatform)
  .crossType(CrossType.Full)
  .in(file("."))
@@ -36,17 +30,10 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
  .settings(
  name :="scala-xml",
  scalaModuleAutomaticModuleName :=Some("scala.xml"),
- crossScalaVersions :=Seq("2.13.11", "2.12.18", "3.3.0"),
+ crossScalaVersions :=Seq("2.13.11", "2.12.18", "2.11.12"),
  scalaVersion :="2.12.18",
 
- scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match{
-caseSome((3, _)) =>
-Seq("-language:Scala2")
-case _ =>
-// Compiler team advised avoiding the -Xsource:3 option for releases.
-// The output with -Xsource:3 should be periodically checked, though.
-Seq("-deprecation:false", "-feature", "-Xlint:-stars-align,-nullary-unit,_")
- }),
+ scalacOptions ++=Seq("-deprecation:false", "-feature", "-Xlint:-stars-align,-nullary-unit,_"),
 
 Test/ scalacOptions +="-Xxml:coalescing",
 
@@ -63,29 +50,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
  |""".stripMargin)),
 
  versionPolicyIntention :=Compatibility.BinaryCompatible,
-// Note: See discussion on non-JVM Mima in https://github.com/scala/scala-xml/pull/517
- mimaBinaryIssueFilters ++={
-//import com.typesafe.tools.mima.core.{}
-//import com.typesafe.tools.mima.core.ProblemFilters
-Seq( // exclusions for all Scala versions
- ) ++ (CrossVersion.partialVersion(scalaVersion.value) match{
-caseSome((3, _)) =>Seq( // Scala 3-specific exclusions
- )
-caseSome((2, minor)) =>Seq( // Scala 2-specific exclusions
- ) ++ (minor match{
-case13=>Seq( // Scala 2.13-specific exclusions
- )
-case12=>Seq( // Scala 2.12-specific exclusions
- )
- })
-case _ =>Seq()
- })
- },
-// Mima signature checking stopped working after 3.0.2 upgrade, see #557
- mimaReportSignatureProblems := (CrossVersion.partialVersion(scalaVersion.value) match{
-caseSome((3, _)) =>false
-case _ =>true
- }),
 
  apiMappings ++= scalaInstance.value.libraryJars.filter{file =>
  file.getName.startsWith("scala-library") && file.getName.endsWith(".jar")
@@ -121,41 +85,11 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
  libraryDependencies +="junit"%"junit"%"4.13.2"%Test,
  libraryDependencies +="com.github.sbt"%"junit-interface"%"0.13.3"%Test,
  libraryDependencies +="org.apache.commons"%"commons-lang3"%"3.12.0"%Test,
- libraryDependencies +="xerces"%"xercesImpl"%"2.12.2"%Test,
- libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match{
-caseSome((3, _)) =>
-Seq()
-case _ =>
-Seq("org.scala-lang"%"scala-compiler"% scalaVersion.value %Test)
- }),
+ libraryDependencies += ("org.scala-lang"%"scala-compiler"% scalaVersion.value %Test).exclude("org.scala-lang.modules", s"scala-xml_${scalaBinaryVersion.value}")
  )
  .jsSettings(
+ crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith("2.11")),
 // Scala.js cannot run forked tests
 Test/ fork :=false
  )
  .jsEnablePlugins(ScalaJSJUnitPlugin)
- .nativeSettings(
- versionPolicyCheck / skip :=true,
- versionCheck / skip :=true,
-// Scala Native cannot run forked tests
-Test/ fork :=false,
- libraryDependencies +="org.scala-native"%%%"junit-runtime"% nativeVersion %Test,
-Test/ scalacOptions +={
-vallog= streams.value.log
-valretrieveDir= baseDirectory.value /"scala-native-junit-plugin-jars"
-vallm= dependencyResolution.value
-valcp= lm
- .retrieve(
-"org.scala-native"%s"junit-plugin_${scalaVersion.value}"% nativeVersion,
- scalaModuleInfo =None,
- retrieveDir,
- log
- )
- .fold(w =>throw w.resolveException, identity)
-valjarPath= cp
- .find(_.toString.contains("junit-plugin"))
- .getOrElse(thrownewException("Can't find Scala Native junit-plugin jar"))
-s"-Xplugin:$jarPath"
- },
-Test/ testOptions +=Tests.Argument(TestFrameworks.JUnit, "-a", "-s", "-v"),
- )