Skip to content

Commit 2bb8b1b

Browse files
committed
build and test against scala 3.3.7
Backports of 3.7 improvements affecting expect tests - [3.7.1] diagnostics & [3.7.2] PC (keep identical input files to skip 3.6) - [unreleased] synthetic apply scala/scala3#23629
1 parent cb68046 commit 2bb8b1b

File tree

11 files changed

+25
-420
lines changed

11 files changed

+25
-420
lines changed

bin/test-release.sh

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

66
scala212=2.12.20
77
scala213=2.13.16
8-
scala3LTS=3.3.6
8+
scala3LTS=3.3.7-RC1
99
scala3Next=3.7.2
1010

1111
cs resolve \

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import sbt._
77
object Dependencies {
88
val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.20")
99
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.16") // remove 2.13.14 hack in RuleSuite when bumping
10-
val scala33 = "3.3.6"
10+
val scala33 = "3.3.7-RC1"
1111
val scala35 = "3.5.2"
1212
val scala36 = "3.6.4"
1313
val scala37 = "3.7.2"

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+
scala33 -> Some("3.3.6"),
247248
scala37 -> Some("3.7.0")
248249
)
249250

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
rule = RemoveUnused
3+
*/
4+
package test.removeUnused
5+
6+
object UnusedParams {
7+
val f: String => Unit = unused => println("f")
8+
val ff = (unused: String) => println("f")
9+
val fs = (used: String, unused: Long) => println(used)
10+
def g(x: String => Unit): Unit = ???
11+
g{implicit string => println("g")}
12+
}

scalafix-tests/integration/src/main/resources-3.3/expect/Pretty.expect

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
[7:7..7:17]: test/PrettyTest# => class PrettyTest extends Object { self: PrettyTest => +6 decls }
22
[8:3..8:14]: *[Int]
33
[8:3..8:7]: *.apply[Int]
4+
[8:3..8:10]: List.apply[Int](*)
45
[8:3..8:3]: test/PrettyTest#`<init>`(). => primary ctor <init>(): PrettyTest
56
[10:10..10:11]: intWrapper(*)
67
[11:10..11:11]: intWrapper(*)
78
[15:10..15:16]: *.apply[Inclusive]
9+
[15:10..15:26]: Future.apply[Inclusive](*)
810
[15:10..15:26]: *(global)
911
[15:17..15:18]: intWrapper(*)
1012
[16:10..16:16]: *.apply[Inclusive]
13+
[16:10..16:32]: Future.apply[Inclusive](*)
1114
[16:10..16:32]: *(global)
1215
[16:17..16:18]: intWrapper(*)
1316
[21:3..21:3]: test/PrettyTest#Inner#`<init>`(). => primary ctor <init>(): Inner
@@ -18,7 +21,14 @@
1821
local4 => abstract method foo(a: Int): Int
1922
local5 => abstract method bar(a: Int): Int
2023
}]
24+
[25:3..28:6]: Option.apply[Object {
25+
local6 => abstract method foo(a: Int): Int
26+
local7 => abstract method bar(a: Int): Int
27+
}](*)
28+
[29:3..29:12]: Option.apply[a.Inner](*)
2129
[30:3..30:9]: *.apply[Int & String]
30+
[30:3..30:45]: Option.apply[Int & String](*)
31+
[31:3..31:39]: Option.apply[PrettyTest](*)
2232
[38:7..38:10]: test/ann# => class ann[T] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
2333
[38:10..38:10]: test/ann#`<init>`(). => primary ctor <init>[T](x: T): ann[T]
2434
[38:11..38:12]: test/ann#[T] => typeparam T
File renamed without changes.
File renamed without changes.
File renamed without changes.

scalafix-tests/output/src/main/scala-3lts/test/explicitResultTypes/EnumerationValue.scala

Lines changed: 0 additions & 21 deletions
This file was deleted.

scalafix-tests/output/src/main/scala-3lts/test/explicitResultTypes/ExplicitResultTypesNil.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)