Merge branch 'master' into update/scala-library-2.12.13

lemonlabsuk · Mar 11, 2021 · 42fb930 · 42fb930
2 parents 2639274 + cc82e16
commit 42fb930
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,9 +13,9 @@ jdk:
 
 jobs:
   include:
-    - scala: [2.13.2]
+    - scala: [2.13.5]
       env: PROJECT=scalaUriJVM COVERAGE=coverageOff
-    - scala: [2.13.2]
+    - scala: [2.13.5]
       env: PROJECT=scalaUriJS COVERAGE=coverageOff
     - scala: [2.12.13]
       env: PROJECT=scalaUriJVM COVERAGE=coverageOn

diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ import com.typesafe.tools.mima.core.{
 import com.typesafe.tools.mima.plugin.MimaKeys.{mimaBinaryIssueFilters, mimaPreviousArtifacts, mimaReportBinaryIssues}
 
 name                            := "scala-uri root"
-scalaVersion in ThisBuild       := "2.13.2"
+scalaVersion in ThisBuild       := "2.13.5"
 crossScalaVersions in ThisBuild := Seq("2.12.13", scalaVersion.value)
 skip in publish                 := true // Do not publish the root project