Skip to content

Commit 438b813

Browse files
authored
Merge pull request #288 from ashawley/bump-version
Bump version for next release
2 parents e6b53bb + 4367c8d commit 438b813

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

admin/api-docs.sh

+1
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,4 @@ env JAVA_HOME=$(/usr/libexec/java_home -v 1.6) TARGET_DIR=./target ./admin/api-d
6868
env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) TARGET_DIR=./target ./admin/api-docs.sh v1.0.6 2.12.0
6969
env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) ./admin/api-docs.sh v1.1.0 2.12.4
7070
env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) ./admin/api-docs.sh v1.1.1 2.12.6
71+
env JAVA_HOME=$(/usr/libexec/java_home -v 1.8) ./admin/api-docs.sh v1.2.0 2.12.8

build.sbt

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
1111
.jvmSettings(scalaModuleSettingsJVM)
1212
.settings(
1313
name := "scala-xml",
14-
version := "1.2.0-SNAPSHOT",
14+
version := "1.2.1-SNAPSHOT",
1515

1616
// this line could be removed after https://github.com/scala/sbt-scala-module/issues/48 is fixed
1717
licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
@@ -29,8 +29,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
2929
)
3030
},
3131
mimaPreviousVersion := {
32-
if (System.getenv("SCALAJS_VERSION") == "1.0.0-M7") None // No such release yet
33-
else Some("1.1.1")
32+
Some("1.2.0")
3433
},
3534

3635
unmanagedSourceDirectories in Compile ++= {

0 commit comments

Comments
 (0)