Skip to content

Commit f9af495

Browse files
authored
Merge pull request scalacenter#2290 from scalacenter/copilot/fix-e671372e-ffaf-453d-bf89-f7e8d3455e5e
build and test against scala 2.13.17
2 parents 4e472ea + 0bb0532 commit f9af495

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

bin/test-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eux
44
version=$1
55

66
scala212=2.12.20
7-
scala213=2.13.16
7+
scala213=2.13.17
88
scala3LTS=3.3.6
99
scala3Next=3.7.3
1010

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import sbt._
66

77
object Dependencies {
88
val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.20")
9-
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.16") // remove 2.13.14 hack in RuleSuite when bumping
9+
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.17")
1010
val scala33 = "3.3.6"
1111
val scala35 = "3.5.2"
1212
val scala36 = "3.6.4"

project/ScalafixBuild.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
244244
)
245245

246246
private val PreviousScalaVersion: Map[String, Option[String]] = Map(
247+
scala213 -> Some("2.13.16"),
247248
scala37 -> Some("3.7.0")
248249
)
249250

scalafix-tests/expect/src/test/scala/scalafix/tests/rule/RuleSuite.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ class RuleSuite extends AbstractSemanticRuleSuite with AnyFunSuiteLike {
4949
if (
5050
// ExplicitResultTypes can only run against sources compiled with the same
5151
// binary version as the one used to compile the rule
52-
(versionMismatch && explicitResultTypesTest) ||
53-
// RemoveUnusedPatternVars has the old 2.12.x behavior for 2.13.14
54-
(inputSV == "2.13.14" && path.endsWith("RemoveUnusedPatternVars.scala"))
52+
versionMismatch && explicitResultTypesTest
5553
) return
5654
else super.runOn(diffTest)
5755
}

0 commit comments

Comments
 (0)