Skip to content

Commit 6d43269

Browse files
Merge pull request #1334 from bjaglin/scala2135
scala 2.13.5
2 parents b0b017e + 7a814ae commit 6d43269

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.scalafix.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rules = [
2-
ExplicitResultTypes,
2+
# ExplicitResultTypes, #pending release of sbt-scalafix supporting 2.13.5
33
OrganizeImports
44
]
55

bin/test-release.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ cs resolve \
1010
ch.epfl.scala:scalafix-core_2.13:$version \
1111
ch.epfl.scala:scalafix-reflect_2.11.12:$version \
1212
ch.epfl.scala:scalafix-reflect_2.12.13:$version \
13-
ch.epfl.scala:scalafix-reflect_2.13.4:$version \
13+
ch.epfl.scala:scalafix-reflect_2.13.5:$version \
1414
ch.epfl.scala:scalafix-cli_2.11.12:$version \
1515
ch.epfl.scala:scalafix-cli_2.12.13:$version \
16-
ch.epfl.scala:scalafix-cli_2.13.4:$version \
16+
ch.epfl.scala:scalafix-cli_2.13.5:$version \
1717
ch.epfl.scala:scalafix-testkit_2.11.12:$version \
1818
ch.epfl.scala:scalafix-testkit_2.12.13:$version \
19-
ch.epfl.scala:scalafix-testkit_2.13.4:$version \
19+
ch.epfl.scala:scalafix-testkit_2.13.5:$version \
2020
-r sonatype:public

project/Dependencies.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import scala.util.{Properties, Try}
44
/* scalafmt: { maxColumn = 120 }*/
55

66
object Dependencies {
7-
val scalametaV = "4.4.8"
7+
val scalametaV = "4.4.10"
88
val metaconfigV = "0.9.10"
99
def scala210 = "2.10.7"
1010
def scala211 = "2.11.12"
1111
def scala212 = "2.12.13"
12-
def scala213 = "2.13.4"
12+
def scala213 = "2.13.5"
1313
def coursierV = "2.0.0-RC5-6"
1414
def coursierInterfaceV = "1.0.2"
1515
val currentScalaVersion = scala213

project/ScalafixBuild.scala

+1
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
267267
)
268268

269269
private val PreviousScalaVersion: Map[String, String] = Map(
270+
"2.13.5" -> "2.13.4"
270271
)
271272

272273
override def projectSettings: Seq[Def.Setting[_]] = List(

0 commit comments

Comments
 (0)