diff --git a/admin/api-docs.sh b/admin/api-docs.sh index 9568a4cc7..ece2b11e1 100755 --- a/admin/api-docs.sh +++ b/admin/api-docs.sh @@ -68,3 +68,4 @@ env JAVA_HOME=$(/usr/libexec/java_home -v 1.6) TARGET_DIR=./target ./admin/api-d env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) TARGET_DIR=./target ./admin/api-docs.sh v1.0.6 2.12.0 env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) ./admin/api-docs.sh v1.1.0 2.12.4 env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) ./admin/api-docs.sh v1.1.1 2.12.6 +env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) ./admin/api-docs.sh v1.2.0 2.12.8 diff --git a/build.sbt b/build.sbt index 91c112cf1..61c479c2b 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) .jvmSettings(scalaModuleSettingsJVM) .settings( name := "scala-xml", - version := "1.2.0-SNAPSHOT", + version := "1.2.1-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"))), @@ -29,8 +29,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) ) }, mimaPreviousVersion := { - if (System.getenv("SCALAJS_VERSION") == "1.0.0-M7") None // No such release yet - else Some("1.1.1") + Some("1.2.0") }, unmanagedSourceDirectories in Compile ++= {