Merge pull request sbt#88 from eed3si9n/wip/1.1.1

Bump Scala versions

.travis.yml

@@ -1,12 +1,21 @@
 language: scala
 jdk: oraclejdk8
-script: sbt ++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test
 
-scala:
-   - 2.10.6
-   - 2.11.11
-   - 2.12.3
-   - 2.13.0-M1
+matrix:
+  include:
+   - scala: 2.10.7
+     env: CMD="mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
+
+   - scala: 2.11.12
+     env: CMD="mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
+
+   - scala: 2.12.4
+     env: CMD="mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
+
+   - scala: 2.13.0-M2
+     env: CMD=compile
+
+script: sbt ++$TRAVIS_SCALA_VERSION $CMD
 
 cache:
   directories:

build.sbt

@@ -33,7 +33,10 @@ val io = (project in file("io"))
   .settings(
     commonSettings,
     name := "IO",
-    libraryDependencies ++= Seq(scalaCompiler.value % Test, scalaCheck % Test, scalatest % Test),
+    libraryDependencies ++= {
+      if (scalaVersion.value startsWith "2.13.") Vector()
+      else Vector(scalaCompiler.value % Test, scalaCheck % Test, scalatest % Test)
+    },
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
     initialCommands in console += "\nimport sbt.io._, syntax._",
     mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "1.0.0"),

project/Dependencies.scala

@@ -2,10 +2,10 @@ import sbt._
 import Keys._
 
 object Dependencies {
-  val scala210 = "2.10.6"
-  val scala211 = "2.11.11"
-  val scala212 = "2.12.3"
-  val scala213 = "2.13.0-M1"
+  val scala210 = "2.10.7"
+  val scala211 = "2.11.12"
+  val scala212 = "2.12.4"
+  val scala213 = "2.13.0-M2"
 
   val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.0
+sbt.version=1.0.4