Merge pull request #95 from exoego/update-versions

Support Scala 2.13.0-RC2 and Scala.js 0.6.27

Author: cquiroz

.travis.yml

@@ -16,19 +16,19 @@ jdk:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.7
-  - 2.13.0-M5
+  - 2.12.8
+  - 2.13.0-RC2
 
 before_install:
   - export PATH=${PATH}:./vendor/bundle
 
 env:
   - TRAVIS_NODE_VERSION="8.11.4"
-    SCALAJS_VERSION="0.6.25"
+    SCALAJS_VERSION="0.6.27"
   - TRAVIS_NODE_VERSION="9.11.2"
-    SCALAJS_VERSION="0.6.25"
+    SCALAJS_VERSION="0.6.27"
   - TRAVIS_NODE_VERSION="10.9.0"
-    SCALAJS_VERSION="0.6.25"
+    SCALAJS_VERSION="0.6.27"
 
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
@@ -48,7 +48,7 @@ cache:
 script:
   - sudo chmod +x /usr/local/bin/sbt
   - sbt ++$TRAVIS_SCALA_VERSION -J-Xmx4G clean scalajavatimeJVM/compile scalajavatimeTestsJVM/compile
-  - if [[ $TRAVIS_SCALA_VERSION != "2.13.0-M5" ]]; then sbt ++$TRAVIS_SCALA_VERSION -J-Xmx4G clean scalajavatimeTestsJVM/test scalajavatimeTestsJS/test scalajavatimeJVM/publishLocal scalajavatimeJS/publishLocal scalajavatimeTZDBJVM/publishLocal scalajavatimeTZDBJS/publishLocal; fi;
+  - if [[ $TRAVIS_SCALA_VERSION != "2.13.0-RC2" ]]; then sbt ++$TRAVIS_SCALA_VERSION -J-Xmx4G clean scalajavatimeTestsJVM/test scalajavatimeTestsJS/test scalajavatimeJVM/publishLocal scalajavatimeJS/publishLocal scalajavatimeTZDBJVM/publishLocal scalajavatimeTZDBJS/publishLocal; fi;
   # docs/makeMicrosite
   # Tricks to avoid unnecessary cache updates, from
   # http://www.scala-sbt.org/0.13/docs/Travis-CI-with-sbt.html

build.sbt

@@ -21,9 +21,9 @@ lazy val commonSettings = Seq(
   scalaVersion       := scalaVer,
   crossScalaVersions := {
     if (scalaJSVersion.startsWith("0.6")) {
-      Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0-M5")
+      Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0-RC2")
     } else {
-      Seq("2.11.12", "2.12.8", "2.13.0-M5")
+      Seq("2.11.12", "2.12.8", "2.13.0-RC2")
     }
   },
   scalacOptions ++= Seq(
@@ -188,7 +188,7 @@ lazy val scalajavatimeTests = crossProject(JVMPlatform, JSPlatform)
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, scalaMajor)) if scalaMajor <= 12 && (scalaJSVersion.startsWith("0.6.")) =>
-          Seq("org.scalatest" %%% "scalatest" % "3.0.5" % "test")
+          Seq("org.scalatest" %%% "scalatest" % "3.0.7" % "test")
         case _ => Seq.empty
       }
     }

project/plugins.sbt

@@ -6,7 +6,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.26")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
 
 addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.0")