From 2204e9e0645ec36ba8607b61706822ee0f8a5090 Mon Sep 17 00:00:00 2001 From: Carlos Quiroz Date: Tue, 4 Dec 2018 16:37:04 -0300 Subject: [PATCH] Release 2.0.0-RC1 Signed-off-by: Carlos Quiroz --- build.sbt | 4 ++-- changes.xml | 8 +++++++- docs/src/main/tut/index.md | 14 +++++++------- docs/src/main/tut/release_process.md | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 6 +++--- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index 9c90afe9b..73326ad2f 100644 --- a/build.sbt +++ b/build.sbt @@ -2,9 +2,9 @@ import sbtcrossproject.{crossProject, CrossType} import sbt._ import sbt.io.Using -val scalaVer = "2.12.7" +val scalaVer = "2.12.8" val tzdbVersion = "2018f" -val scalaJavaTimeVer = "2.0.0-RC1-SNAPSHOT" +val scalaJavaTimeVer = "2.0.0-RC1" val scalaJavaTimeVersion = s"$scalaJavaTimeVer" val scalaTZDBVersion = s"${scalaJavaTimeVer}_$tzdbVersion" diff --git a/changes.xml b/changes.xml index ac41dc300..5c0530e26 100644 --- a/changes.xml +++ b/changes.xml @@ -10,11 +10,17 @@ + + Improved implementation of ZoneMap + + + Support scala.js 0.6.26 + Support scala.js 1.0.0-M6 - Support scala 2.13.0-M6 + Support scala 2.13.0-M5 Update scala-java-locales to v0.3.12-cldr34 diff --git a/docs/src/main/tut/index.md b/docs/src/main/tut/index.md index da84fad3f..3b73547c6 100644 --- a/docs/src/main/tut/index.md +++ b/docs/src/main/tut/index.md @@ -58,8 +58,8 @@ Both Scala 2.11 and Scala 2.12 (2.0.0-M8 and later) are supported. To get started with SBT, add one of these dependencies: -* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M13"` (for Scala) -* `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M13"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) +* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-RC1"` (for Scala) +* `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-RC1"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) To get the latest snapshots add the repo @@ -70,8 +70,8 @@ resolvers += and either: -* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M14-SNAPSHOT"` (for Scala) -* `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M14-SNAPSHOT"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) +* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-RC2-SNAPSHOT"` (for Scala) +* `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-RC2-SNAPSHOT"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) ### Time zones @@ -84,7 +84,7 @@ If you don't need to use timezones in your application you can just stop here. B The timezone for js is provided in a separate bundle which contains all time zones available from [IANA Time Zone Database](https://www.iana.org/time-zones). To use them you need to add the following dependency -* `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.0.0-M13_2018c"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) +* `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.0.0-RC1_2018f"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) Note that the db is fairly large and due to the characteristics of the API it's not very ammenable to optimization This database is published every now and then so it maybe old. For current version see the following section. @@ -101,7 +101,7 @@ To do that you need to: * Add `sbt-tzdb` to your list of plugins (Note you need sbt 1.x) ```scala -addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.1.2") +addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.3.1") ``` * Enable the plugin for your `Scala.js` project: @@ -154,7 +154,7 @@ Have a look at the [issues](https://github.com/cquiroz/scala-java-time/issues) o ##### 2.0 -A stable release of 2.0 will be published with only `java.time` on its binary after a (hopefully) short RC phase. +A stable release of 2.0 will be published with only `java.time` on its binary after RC-2 is published. #### FAQs diff --git a/docs/src/main/tut/release_process.md b/docs/src/main/tut/release_process.md index 87e5eac9d..0b50dc0d5 100644 --- a/docs/src/main/tut/release_process.md +++ b/docs/src/main/tut/release_process.md @@ -9,10 +9,10 @@ docs/publishMicrosite Important: Remember to clean between different scala.js versions -on 1.0.0-M3 +on 1.0.0-M6 ``` -SCALAJS_VERSION=1.0.0-M3 sbt +SCALAJS_VERSION=1.0.0-M6 sbt clean +publishSigned sonatyeRelease diff --git a/project/build.properties b/project/build.properties index 0cd8b0798..72f902892 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.3 +sbt.version=1.2.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index b61be7f54..7f0562ca9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,10 +3,10 @@ addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.15") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25") + Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.26") addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.0") @@ -14,4 +14,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") -addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.3.0") +addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.3.1")