Skip to content

Commit 964464c

Browse files
authored
Merge pull request #57 from sjrd/scalajs-1.0.0
Upgrade to Scala.js 1.0.0, and make it the default.
2 parents 9297197 + d53b8d2 commit 964464c

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ jdk:
1515
- openjdk8
1616
env:
1717
- SCALAJS_VERSION=0.6.31
18-
- SCALAJS_VERSION=1.0.0-M8
19-
- SCALAJS_VERSION=1.0.0-RC1
18+
- SCALAJS_VERSION=1.0.0
2019
matrix:
2120
exclude:
2221
- scala: 2.10.7
23-
env: SCALAJS_VERSION=1.0.0-M8
24-
- scala: 2.10.7
25-
env: SCALAJS_VERSION=1.0.0-RC1
22+
env: SCALAJS_VERSION=1.0.0
2623

2724
cache:
2825
directories:

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/scala-js/scala-js-java-time.svg?branch=master)](https://travis-ci.org/scala-js/scala-js-java-time)
44
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.29.svg)](https://www.scala-js.org/)
5-
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0-M8.svg)](https://www.scala-js.org)
6-
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0-RC1.svg)](https://www.scala-js.org)
5+
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0.svg)](https://www.scala-js.org)
76

87
`scalajs-java-time` is a BSD-licensed reimplementation of the `java.time` API
98
of JDK8 for Scala.js. It enables this API in Scala.js projects.

project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
55
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")

0 commit comments

Comments
 (0)