Skip to content

Commit 419111b

Browse files
committed
Support scala 2.13.0
Signed-off-by: Carlos Quiroz <[email protected]>
1 parent 102bf99 commit 419111b

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ before_install:
2323
- export PATH=${PATH}:./vendor/bundle
2424

2525
env:
26-
2726
- TRAVIS_NODE_VERSION="9.11.2"
2827
SCALAJS_VERSION="0.6.28"
2928
- TRAVIS_NODE_VERSION="10.9.0"

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sbt.io.Using
44

55
val scalaVer = "2.12.8"
66
val tzdbVersion = "2019a"
7-
val scalaJavaTimeVer = "2.0.0-RC3-SNAPSHOT"
7+
val scalaJavaTimeVer = "2.0.0-RC3"
88
val scalaJavaTimeVersion = s"$scalaJavaTimeVer"
99
val scalaTZDBVersion = s"${scalaJavaTimeVer}_$tzdbVersion"
1010

@@ -188,7 +188,7 @@ lazy val scalajavatimeTests = crossProject(JVMPlatform, JSPlatform)
188188
libraryDependencies ++= {
189189
CrossVersion.partialVersion(scalaVersion.value) match {
190190
case Some((2, scalaMajor)) if scalaMajor == 13 =>
191-
Seq("org.scalatest" %%% "scalatest" % "3.1.0-SNAP12" % "test")
191+
Seq("org.scalatest" %%% "scalatest" % "3.0.8" % "test")
192192
case Some((2, scalaMajor)) if scalaMajor <= 12 && (scalaJSVersion.startsWith("0.6.")) =>
193193
Seq("org.scalatest" %%% "scalatest" % "3.0.7" % "test")
194194
case _ => Seq.empty

changes.xml

+12
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
<author>Stephen Colebourne (Java version)</author>
99
</properties>
1010
<body>
11+
<!-- types are add, fix, remove, update -->
12+
<release version="2.0.0-RC3" date="" description="v2.0.0-RC3">
13+
<action dev="cquiroz" type="update" >
14+
Support scala.js 0.6.28
15+
</action>
16+
<action dev="cquiroz" type="update" >
17+
Support scala.js 1.0.0-M8
18+
</action>
19+
<action dev="cquiroz" type="update" >
20+
Support scala 2.13.0
21+
</action>
22+
</release>
1123
<!-- types are add, fix, remove, update -->
1224
<release version="2.0.0-RC2" date="" description="v2.0.0-RC2">
1325
<action dev="cquiroz" type="update" >

docs/src/main/tut/index.md

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

@@ -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-RC2_2019a"` (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-RC3_2019a"` (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.

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-M7
12+
on 1.0.0-M8
1313

1414
```
15-
SCALAJS_VERSION=1.0.0-M7 sbt
15+
SCALAJS_VERSION=1.0.0-M8 sbt
1616
clean
1717
+publishSigned
1818
sonatyeRelease

0 commit comments

Comments
 (0)