Publish 2.0.0-M4 for Scala{.js} 2.10, 2.11 and 2.12

soc · soc · commit ccc359300028 · 2016-11-06T21:09:20.000+01:00
diff --git a/README.md b/README.md
@@ -49,12 +49,12 @@ chrono.MinguoDate.now(fixedClock).toString       == "Minguo ROC 98-02-13"
 #### Usage
 
 The *scala-java-time* library is currently available for Scala (JVM, version 8 and later) and Scala.js (JavaScript).
-Scala 2.10, 2.11, and 2.12 (2.12.0-M5 and later) are supported.
+Scala 2.10, 2.11, and 2.12 are supported.
 
 To get started with SBT, add one (or both) of these dependencies:
 
-- `libraryDependencies += "io.github.soc" %%  "scala-java-time" % "2.0.0-M3"` (for Scala)
-- `libraryDependencies += "io.github.soc" %%% "scala-java-time" % "2.0.0-M3"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)
+- `libraryDependencies += "io.github.soc" %%  "scala-java-time" % "2.0.0-M4"` (for Scala)
+- `libraryDependencies += "io.github.soc" %%% "scala-java-time" % "2.0.0-M4"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)
 
 #### Building
 This project builds using sbt.
diff --git a/build.sbt b/build.sbt
@@ -3,11 +3,11 @@ import sbt._
 import io.github.soc.testng.{TestNGPlugin, TestNGScalaJSPlugin}
 
 val scalaVer = "2.11.8"
-val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.0-M5")
+val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.0")
 
 lazy val commonSettings = Seq(
   name         := "scala-java-time",
-  version      := "2.0.0-M3",
+  version      := "2.0.0-M4",
   organization := "io.github.soc",
   homepage     := Some(url("https://github.com/soc/scala-java-time")),
   licenses     := Seq("BSD 3-Clause License" -> url("https://opensource.org/licenses/BSD-3-Clause")),
@@ -58,7 +58,7 @@ lazy val scalajavatime = crossProject.crossType(CrossType.Full).in(file("."))
     TestNGPlugin.testNGSuites := Seq(((resourceDirectory in Test).value / "testng.xml").absolutePath)
   ).jsSettings(
     libraryDependencies ++= Seq(
-      "com.github.cquiroz" %%% "scala-java-locales" % "0.3.0-cldr30"
+      "com.github.cquiroz" %%% "scala-java-locales" % "0.3.1-cldr30"
     )
   )
 
diff --git a/changes.xml b/changes.xml
@@ -7,8 +7,12 @@
     <author>Stephen Colebourne (Java version)</author>
   </properties>
   <body>
-
     <!-- types are add, fix, remove, update -->
+    <release version="2.0.0-M4" date="2016-11-06" description="v2.0.0-M4">
+      <action dev="cquiroz" type="update" >
+        Update locales version using CLDR 30
+      </action>
+    </release>
     <release version="2.0.0-M3" date="2016-08-09" description="v2.0.0-M3">
       <action dev="soc" type="update" >
         Cherry-pick fixes from upstream.
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.13
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,8 @@
 resolvers += Resolver.sonatypeRepo("public")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.11")
-
-addSbtPlugin("io.github.soc" % "sbt-testng" % "4.0.0-M2")
-
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M13")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+addSbtPlugin("io.github.soc" % "sbt-testng" % "4.0.0-M3")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-7")
 
 // Incompatible with 2.12.0-M5
 // addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
diff --git a/shared/src/test/scala/org/threeten/bp/TestExamples.scala b/shared/src/test/scala/org/threeten/bp/TestExamples.scala
@@ -27,7 +27,8 @@ import org.testng.Assert.assertEquals
     val duration = Duration.between(date, tomorrow)
     assertEquals(duration.toMinutes, 1440L)
 
-    val instant = Instant.now(fixedClock)
+    val instant1 = Instant.now(fixedClock)
+    val instant2 = Instant.parse("2007-12-03T10:15:30.00Z")
 
     val period = Period.between(date.toLocalDate, tomorrow.toLocalDate)
     assertEquals(period.get(temporal.ChronoUnit.DAYS), 1L)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.13.12`
	`1`	`+sbt.version=0.13.13`