Skip to content

Commit ad07d3d

Browse files
authored
Update Scala to 3.5 (#2858)
Backport of: #2857
1 parent 8f14987 commit ad07d3d

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
8686
<maven.surefire.version>3.5.0</maven.surefire.version>
8787
<maven.source.version>3.3.1</maven.source.version>
8888
<maven.exec.version>3.4.1</maven.exec.version>
89-
<scala.maven.version>3.4.4</scala.maven.version>
90-
<scala.version>2.12.6</scala.version>
91-
<scala.compat.version>2.12</scala.compat.version>
89+
<scala.maven.version>4.9.2</scala.maven.version>
90+
<scala.version>3.5.1</scala.version>
9291
</properties>
9392
<dependencyManagement>
9493
<dependencies>
@@ -188,7 +187,6 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
188187
<version>${scala.maven.version}</version>
189188
<configuration>
190189
<scalaVersion>${scala.version}</scalaVersion>
191-
<scalaCompatVersion>${scala.compat.version}</scalaCompatVersion>
192190
<failOnMultipleScalaVersions>true</failOnMultipleScalaVersions>
193191
</configuration>
194192
<executions>

vavr/generator/Generator.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,7 +2116,7 @@ def generateMainClasses(): Unit = {
21162116
}
21172117
""")}
21182118

2119-
${(i > 1) gen (1 to i).gen(j => xs"""
2119+
${(i > 1) `gen` (1 to i).gen(j => xs"""
21202120
/$javadoc
21212121
* Maps the ${j.ordinal} component of this tuple to a new value.
21222122
*
@@ -2173,7 +2173,7 @@ def generateMainClasses(): Unit = {
21732173
}
21742174
""")}
21752175

2176-
${(i < N) gen (1 to N-i).gen(j => xs"""
2176+
${(i < N) `gen` (1 to N-i).gen(j => xs"""
21772177
/$javadoc
21782178
* Concat a tuple's values to this tuple.
21792179
*
@@ -3625,7 +3625,7 @@ def generateTestClasses(): Unit = {
36253625
}
36263626
""")}
36273627

3628-
${(i > 1) gen (1 to i).gen(j => {
3628+
${(i > 1) `gen` (1 to i).gen(j => {
36293629
val substitutedResultTypes = if (i == 0) "" else s"<${(1 to i).gen(k => if (k == j) "String" else "Integer")(", ")}>"
36303630
val ones = (1 to i).gen(_ => "1")(", ")
36313631
val result = (1 to i).gen(k => if (k == j) "\"X\"" else "1")(", ")
@@ -3655,7 +3655,7 @@ def generateTestClasses(): Unit = {
36553655
}
36563656
""")}
36573657

3658-
${(i < N) gen (1 to N-i).gen(j => xs"""
3658+
${(i < N) `gen` (1 to N-i).gen(j => xs"""
36593659
@$test
36603660
public void shouldConcatTuple$j() {
36613661
final Tuple${i+j}<${(1 to i+j).gen(j => s"Integer")(", ")}> actual = ${ if (i == 0) "Tuple0.instance()" else s"Tuple.of(${(1 to i).gen(j => xs"$j")(", ")})"}.concat(Tuple.of(${(i+1 to i+j).gen(k => s"$k")(", ")}));

0 commit comments

Comments
 (0)