Skip to content

Commit fddfc72

Browse files
cquirozcquiroz
authored
Merge pull request #92 from cquiroz/release
Release 2.0.0-RC1
2 parents 26b8c23 + 2204e9e commit fddfc72

File tree

6 files changed

+22
-16
lines changed

6 files changed

+22
-16
lines changed

‎build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import sbtcrossproject.{crossProject, CrossType}
22
import sbt._
33
import sbt.io.Using
44

5-
val scalaVer = "2.12.7"
5+
val scalaVer = "2.12.8"
66
val tzdbVersion = "2018f"
7-
val scalaJavaTimeVer = "2.0.0-RC1-SNAPSHOT"
7+
val scalaJavaTimeVer = "2.0.0-RC1"
88
val scalaJavaTimeVersion = s"$scalaJavaTimeVer"
99
val scalaTZDBVersion = s"${scalaJavaTimeVer}_$tzdbVersion"
1010

‎changes.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
<body>
1111
<!-- types are add, fix, remove, update -->
1212
<release version="2.0.0-RC1" date="" description="v2.0.0-RC1">
13+
<action dev="cquiroz" type="update" >
14+
Improved implementation of ZoneMap
15+
</action>
16+
<action dev="cquiroz" type="update" >
17+
Support scala.js 0.6.26
18+
</action>
1319
<action dev="cquiroz" type="update" >
1420
Support scala.js 1.0.0-M6
1521
</action>
1622
<action dev="cquiroz" type="update" >
17-
Support scala 2.13.0-M6
23+
Support scala 2.13.0-M5
1824
</action>
1925
<action dev="cquiroz" type="update" >
2026
Update scala-java-locales to v0.3.12-cldr34

‎docs/src/main/tut/index.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Both Scala 2.11 and Scala 2.12 (2.0.0-M8 and later) are supported.
5858

5959
To get started with SBT, add one of these dependencies:
6060

61-
* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M13"` (for Scala)
62-
* `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)
61+
* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-RC1"` (for Scala)
62+
* `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)
6363

6464
To get the latest snapshots add the repo
6565

@@ -70,8 +70,8 @@ resolvers +=
7070

7171
and either:
7272

73-
* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M14-SNAPSHOT"` (for Scala)
74-
* `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)
73+
* `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-RC2-SNAPSHOT"` (for Scala)
74+
* `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)
7575

7676
### Time zones
7777

@@ -84,7 +84,7 @@ If you don't need to use timezones in your application you can just stop here. B
8484
The timezone for js is provided in a separate bundle which contains all time zones available from
8585
[IANA Time Zone Database](https://www.iana.org/time-zones). To use them you need to add the following dependency
8686

87-
* `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)
87+
* `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)
8888

8989
Note that the db is fairly large and due to the characteristics of the API it's not very ammenable to optimization
9090
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:
101101
* Add `sbt-tzdb` to your list of plugins (Note you need sbt 1.x)
102102

103103
```scala
104-
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.1.2")
104+
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.3.1")
105105
```
106106

107107
* 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
154154

155155
##### 2.0
156156

157-
A stable release of 2.0 will be published with only `java.time` on its binary after a (hopefully) short RC phase.
157+
A stable release of 2.0 will be published with only `java.time` on its binary after RC-2 is published.
158158

159159
#### FAQs
160160

‎docs/src/main/tut/release_process.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ docs/publishMicrosite
99

1010
Important: Remember to clean between different scala.js versions
1111

12-
on 1.0.0-M3
12+
on 1.0.0-M6
1313

1414
```
15-
SCALAJS_VERSION=1.0.0-M3 sbt
15+
SCALAJS_VERSION=1.0.0-M6 sbt
1616
clean
1717
+publishSigned
1818
sonatyeRelease

‎project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.3
1+
sbt.version=1.2.7

‎project/plugins.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.15")
33

44
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
55

6-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
6+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
77

88
val scalaJSVersion =
9-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25")
9+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.26")
1010

1111
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.0")
1212

1313
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1414

1515
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
1616

17-
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.3.0")
17+
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.3.1")

0 commit comments

Comments
 (0)