Merge pull request #23 from xuwei-k/Scala-2.12.6

Scala 2.12.6
scalapb · May 4, 2018 · 95701c0 · 95701c0
2 parents f0eb960 + 5a82e07
commit 95701c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ jdk: oraclejdk8
 scala:
     - 2.10.7
     - 2.11.12
-    - 2.12.4
+    - 2.12.6
     - 2.13.0-M3
 
 matrix:

diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ val Scala211 = "2.11.12"
 
 scalaVersion in ThisBuild := Scala211
 
-crossScalaVersions := Seq(Scala211, "2.10.7", "2.12.4", "2.13.0-M3")
+crossScalaVersions := Seq(Scala211, "2.10.7", "2.12.6", "2.13.0-M3")
 
 organization in ThisBuild := "com.thesamet.scalapb"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ jdk: oraclejdk8 @@
     scala:
         - 2.10.7
         - 2.11.12
-        - 2.12.4
+        - 2.12.6
         - 2.13.0-M3
     matrix:
@@ Expand Down @@