Merge pull request #94 from povder/scala-2.13.0-M1

Cross build with Scala 2.13.0-M1
lightbend-labs · Sep 14, 2017 · 9a19f9b · 9a19f9b
2 parents 17675ec + 146a718
commit 9a19f9b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ language: scala
 scala:
    - 2.11.11
    - 2.12.2
+   - 2.13.0-M1
 env:
 - JDK=oraclejdk8
 - JDK=openjdk8
@@ -17,9 +18,13 @@ addons:
 before_script:
   - jdk_switcher use $JDK
 matrix:
-  # scala 2.12 requires java 8
+  # scala 2.12 and 2.13 require java 8
   exclude:
     - scala: 2.12.2
       env: JDK=oraclejdk7
     - scala: 2.12.2
-      env: JDK=openjdk7
+      env: JDK=openjdk7
+    - scala: 2.13.0-M1
+      env: JDK=oraclejdk7
+    - scala: 2.13.0-M1
+      env: JDK=openjdk7
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,7 +4,7 @@ object Version {
   val logback   = "1.2.3"
   val mockito   = "1.10.19"
   val scala     = "2.11.11"
-  val crossScala = List(scala, "2.12.2")
+  val crossScala = List(scala, "2.12.2", "2.13.0-M1")
   val scalaTest = "3.0.3"
   val slf4j     = "1.7.25"
 }