Merge pull request #33 from sjrd/scalajs-1.0.0

sjrd · web-flow · commit 19ab2196dcd8 · 2020-02-06T17:39:37.000+01:00
Upgrade to Scala.js 1.0.0, and make it the default.
diff --git a/.travis.yml b/.travis.yml
@@ -15,14 +15,11 @@ jdk:
   - openjdk8
 env:
   - SCALAJS_VERSION=0.6.31
-  - SCALAJS_VERSION=1.0.0-M8
-  - SCALAJS_VERSION=1.0.0-RC1
+  - SCALAJS_VERSION=1.0.0
 matrix:
   exclude:
     - scala: 2.10.7
-      env: SCALAJS_VERSION=1.0.0-M8
-    - scala: 2.10.7
-      env: SCALAJS_VERSION=1.0.0-RC1
+      env: SCALAJS_VERSION=1.0.0
 
 cache:
   directories:
diff --git a/README.md b/README.md
@@ -2,8 +2,7 @@
 
 [![Build Status](https://travis-ci.org/scala-js/scala-js-java-logging.svg?branch=master)](https://travis-ci.org/scala-js/scala-js-java-logging)
 [![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.29.svg)](https://www.scala-js.org/)
-[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0-M8.svg)](https://www.scala-js.org)
-[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0-RC1.svg)](https://www.scala-js.org)
+[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0.svg)](https://www.scala-js.org)
 
 `scalajs-java-logging` is a BSD-licensed reimplementation of the `java.logging` API for Scala.js.
 It enables this API in Scala.js projects.
diff --git a/project/build.sbt b/project/build.sbt
@@ -1,5 +1,5 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
