Merge pull request #111 from cquiroz/upgrades

Update scala version and scala.js version

Author: cquiroz

.travis.yml

@@ -2,17 +2,17 @@ sudo: false
 language: scala
 scala:
   - 2.11.12
-  - 2.12.6
-  - 2.13.0-M4
+  - 2.12.7
+  - 2.13.0-M5
 jdk:
   - oraclejdk8
 env:
   - TRAVIS_NODE_VERSION="8.11.4" SCALAJS_VERSION="0.6.25"
-  - TRAVIS_NODE_VERSION="8.11.4" SCALAJS_VERSION="1.0.0-M5"
+  - TRAVIS_NODE_VERSION="8.11.4" SCALAJS_VERSION="1.0.0-M6"
   - TRAVIS_NODE_VERSION="9.11.2" SCALAJS_VERSION="0.6.25"
-  - TRAVIS_NODE_VERSION="9.11.2" SCALAJS_VERSION="1.0.0-M5"
+  - TRAVIS_NODE_VERSION="9.11.2" SCALAJS_VERSION="1.0.0-M6"
   - TRAVIS_NODE_VERSION="10.9.0" SCALAJS_VERSION="0.6.25"
-  - TRAVIS_NODE_VERSION="10.9.0" SCALAJS_VERSION="1.0.0-M5"
+  - TRAVIS_NODE_VERSION="10.9.0" SCALAJS_VERSION="1.0.0-M6"
 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
   - npm install

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## 0.3.12-cldr34
 
 * Update to cldr34
+* Support scala 2.12.7 and 2.13.0-M5
+* Support Scala.js 1.0.0-M6
 
 ## 0.3.11-cldr33
 

build.sbt

@@ -13,9 +13,9 @@ val commonSettings: Seq[Setting[_]] = Seq(
   scalaVersion := "2.12.7",
   crossScalaVersions := {
     if (scalaJSVersion.startsWith("0.6")) {
-      Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M4")
+      Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M5")
     } else {
-      Seq("2.11.12", "2.12.6", "2.13.0-M4")
+      Seq("2.11.12", "2.12.7", "2.13.0-M5")
     }
   },
   scalacOptions ++= Seq("-deprecation", "-feature"),