Merge pull request #1334 from bjaglin/scala2135

scala 2.13.5
scalacenter · Feb 27, 2021 · 6d43269 · 6d43269
2 parents b0b017e + 7a814ae
commit 6d43269
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -1,5 +1,5 @@
 rules = [
-  ExplicitResultTypes,
+#  ExplicitResultTypes, #pending release of sbt-scalafix supporting 2.13.5
   OrganizeImports
 ]
 

diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -10,11 +10,11 @@ cs resolve \
   ch.epfl.scala:scalafix-core_2.13:$version  \
   ch.epfl.scala:scalafix-reflect_2.11.12:$version  \
   ch.epfl.scala:scalafix-reflect_2.12.13:$version  \
-  ch.epfl.scala:scalafix-reflect_2.13.4:$version  \
+  ch.epfl.scala:scalafix-reflect_2.13.5:$version  \
   ch.epfl.scala:scalafix-cli_2.11.12:$version  \
   ch.epfl.scala:scalafix-cli_2.12.13:$version  \
-  ch.epfl.scala:scalafix-cli_2.13.4:$version  \
+  ch.epfl.scala:scalafix-cli_2.13.5:$version  \
   ch.epfl.scala:scalafix-testkit_2.11.12:$version  \
   ch.epfl.scala:scalafix-testkit_2.12.13:$version \
-  ch.epfl.scala:scalafix-testkit_2.13.4:$version \
+  ch.epfl.scala:scalafix-testkit_2.13.5:$version \
   -r sonatype:public
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,12 +4,12 @@ import scala.util.{Properties, Try}
 /* scalafmt: { maxColumn = 120 }*/
 
 object Dependencies {
-  val scalametaV = "4.4.8"
+  val scalametaV = "4.4.10"
   val metaconfigV = "0.9.10"
   def scala210 = "2.10.7"
   def scala211 = "2.11.12"
   def scala212 = "2.12.13"
-  def scala213 = "2.13.4"
+  def scala213 = "2.13.5"
   def coursierV = "2.0.0-RC5-6"
   def coursierInterfaceV = "1.0.2"
   val currentScalaVersion = scala213

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -267,6 +267,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
   )
 
   private val PreviousScalaVersion: Map[String, String] = Map(
+    "2.13.5" -> "2.13.4"
   )
 
   override def projectSettings: Seq[Def.Setting[_]] = List(
-Original file line number
+Diff line change
@@ Expand Up / @@ -267,6 +267,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { @@
       )
       private val PreviousScalaVersion: Map[String, String] = Map(
+        "2.13.5" -> "2.13.4"
       )
       override def projectSettings: Seq[Def.Setting[_]] = List(
@@ Expand Down @@