Various updates for 1.3.0

Author: ashawley

.travis.yml

@@ -6,8 +6,8 @@ jdk:
 
 scala:
  - 2.11.12
- - 2.12.8
- - 2.13.0
+ - 2.12.10
+ - 2.13.1
 
 env:
 global:
@@ -20,17 +20,17 @@ env:
 matrix:
 # The empty SCALAJS_VERSION will only compile for the JVM
  - SCALAJS_VERSION=
- - SCALAJS_VERSION=0.6.28
- - SCALAJS_VERSION=1.0.0-M8
+ - SCALAJS_VERSION=0.6.32
+ - SCALAJS_VERSION=1.0.0
 
 matrix:
 exclude:
  - jdk: openjdk11
-env: SCALAJS_VERSION=0.6.28
+env: SCALAJS_VERSION=0.6.32
  - jdk: openjdk11
-env: SCALAJS_VERSION=1.0.0-M8
+env: SCALAJS_VERSION=1.0.0
  - scala: 2.11.12
-env: SCALAJS_VERSION=1.0.0-M8
+env: SCALAJS_VERSION=1.0.0
  - scala: 2.11.12
 jdk: openjdk11
 

admin/build.sh

@@ -39,7 +39,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
  currentJvmVer=$(java -version 2>&1| awk -F '"''/version/{print $2}'| sed 's/^1\.//'| sed 's/[^0-9].*//')
 echo"Releasing $tagVer with Scala $TRAVIS_SCALA_VERSION on Java version $currentJvmVer."
 
- publishTask="$projectPrefix/publish-signed"
+ publishTask="$projectPrefix/publishSigned"
 
  cat admin/gpg.sbt >> project/plugins.sbt
  cp admin/publish-settings.sbt .

build.sbt

@@ -1,7 +1,7 @@
 importsbtcrossproject.{crossProject, CrossType}
 importScalaModulePlugin._
 
-crossScalaVersions in ThisBuild:=List("2.12.8", "2.11.12", "2.13.0")
+crossScalaVersions in ThisBuild:=List("2.12.10", "2.11.12", "2.13.1")
 
 lazyvalxml= crossProject(JSPlatform, JVMPlatform)
  .withoutSuffixFor(JVMPlatform)
@@ -11,7 +11,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
  .jvmSettings(scalaModuleSettingsJVM)
  .settings(
  name :="scala-xml",
- version :="1.2.1-SNAPSHOT",
+ version :="1.3.0-SNAPSHOT",
 
 // this line could be removed after https://github.com/scala/sbt-scala-module/issues/48 is fixed
  licenses :=Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
@@ -22,7 +22,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
  scalacOptions in Test+="-Xxml:coalescing",
 
  mimaPreviousVersion :={
-if (System.getenv("SCALAJS_VERSION") =="1.0.0-M8") None// No such release yet
+if (System.getenv("SCALAJS_VERSION") =="1.0.0") None
 elseSome("1.2.0")
  },
 
@@ -62,9 +62,9 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
  .jvmSettings(
 OsgiKeys.exportPackage :=Seq(s"scala.xml.*;version=${version.value}"),
 
- libraryDependencies +="junit"%"junit"%"4.12"%"test",
+ libraryDependencies +="junit"%"junit"%"4.13"%"test",
  libraryDependencies +="com.novocode"%"junit-interface"%"0.11"%"test",
- libraryDependencies +="org.apache.commons"%"commons-lang3"%"3.5"%"test",
+ libraryDependencies +="org.apache.commons"%"commons-lang3"%"3.9"%"test",
  libraryDependencies += ("org.scala-lang"%"scala-compiler"% scalaVersion.value %"test").exclude("org.scala-lang.modules", s"scala-xml_${scalaBinaryVersion.value}")
  )
  .jsSettings(

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.18
+sbt.version=1.2.8

project/plugins.sbt

@@ -1,13 +1,8 @@
-if (System.getProperty("java.version").startsWith("1."))
-Seq()
-else
-// override to version that works on Java 9,
-// see https://github.com/scala/sbt-scala-module/issues/35
-Seq(addSbtPlugin("com.typesafe.sbt"%"sbt-osgi"%"0.9.3"))
+addSbtPlugin("com.typesafe.sbt"%"sbt-osgi"%"0.9.5")
 
 valscalaJSVersion=
-Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
+Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.32")
 
 addSbtPlugin("org.scala-js"%"sbt-scalajs"% scalaJSVersion)
-addSbtPlugin("org.portable-scala"%"sbt-scalajs-crossproject"%"0.6.0")
-addSbtPlugin("org.scala-lang.modules"%"sbt-scala-module"%"1.0.14")
+addSbtPlugin("org.portable-scala"%"sbt-scalajs-crossproject"%"0.6.1")
+addSbtPlugin("org.scala-lang.modules"%"sbt-scala-module"%"2.0.0")