From 098e8eb773a59da35f4cfc0fb0c137db53953cf1 Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Mon, 10 Jun 2019 00:56:43 -0400
Subject: [PATCH] Scala 2.13.0 for ScalaCheck 1.14.0

---
 .travis.yml                        | 8 ++++----
 build.sbt                          | 5 ++---
 examples/scalajs/project/build.sbt | 2 +-
 project/build.properties           | 2 +-
 project/plugin.sbt                 | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e4699621..57bdc02dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ scala:
   - 2.10.7
   - 2.11.12
   - 2.12.6
-  - 2.13.0-RC2
+  - 2.13.0
 jdk:
   - oraclejdk8
 env:
@@ -28,7 +28,7 @@ env:
     - PLATFORM=jvm SBT_PARALLEL=true  WORKERS=4 DEPLOY=false
     - PLATFORM=jvm SBT_PARALLEL=false WORKERS=4 DEPLOY=false
     - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true
-    - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M7
+    - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
 sudo: false
 
 matrix:
@@ -47,6 +47,6 @@ matrix:
       - for d in */ ; do cd "$d" && sbt test:compile && cd ../ ; done
   exclude:
     - scala: 2.10.7
-      env: PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M7
-    - scala: 2.13.0-RC2
+      env: PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
+    - scala: 2.13.0
       env: PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true
diff --git a/build.sbt b/build.sbt
index 7bb29343b..8dc6dc4a6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,7 +13,7 @@ lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))
 
 lazy val scalaVersionSettings = Seq(
   scalaVersion := "2.12.6",
-  crossScalaVersions := Seq("2.10.7", "2.11.12", "2.13.0-RC2", scalaVersion.value),
+  crossScalaVersions := Seq("2.10.7", "2.11.12", "2.13.0", scalaVersion.value),
   scalaMajorVersion := {
     val v = scalaVersion.value
     CrossVersion.partialVersion(v).map(_._2.toInt).getOrElse {
@@ -68,11 +68,10 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
     "-encoding", "UTF-8",
     "-feature",
     "-unchecked",
-    "-Xfuture",
     "-Ywarn-dead-code",
     "-Ywarn-numeric-widen") ++ {
     val modern = Seq("-Xlint:-unused", "-Ywarn-unused:-patvars,-implicits,-locals,-privates,-explicits")
-    val removed = Seq("-Ywarn-inaccessible", "-Ywarn-nullary-override", "-Ywarn-nullary-unit")
+    val removed = Seq("-Ywarn-inaccessible", "-Ywarn-nullary-override", "-Ywarn-nullary-unit", "-Xfuture")
     val removedModern = Seq("-Ywarn-infer-any", "-Ywarn-unused-import")
     scalaMajorVersion.value match {
       case 10 => Seq("-Xfatal-warnings", "-Xlint") ++ removed
diff --git a/examples/scalajs/project/build.sbt b/examples/scalajs/project/build.sbt
index de38c267d..53131f3b3 100644
--- a/examples/scalajs/project/build.sbt
+++ b/examples/scalajs/project/build.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
diff --git a/project/build.properties b/project/build.properties
index 0cd8b0798..c0bab0494 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.3
+sbt.version=1.2.8
diff --git a/project/plugin.sbt b/project/plugin.sbt
index e7b8aebe7..50570a888 100644
--- a/project/plugin.sbt
+++ b/project/plugin.sbt
@@ -3,7 +3,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)