Skip to content

Update Scala to 3.5 #2858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pivovarit merged 1 commit into from
Sep 29, 2024
Merged

Update Scala to 3.5 #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
<maven.surefire.version>3.5.0</maven.surefire.version>
<maven.source.version>3.3.1</maven.source.version>
<maven.exec.version>3.4.1</maven.exec.version>
<scala.maven.version>3.4.4</scala.maven.version>
<scala.version>2.12.6</scala.version>
<scala.compat.version>2.12</scala.compat.version>
<scala.maven.version>4.9.2</scala.maven.version>
<scala.version>3.5.1</scala.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -188,7 +187,6 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
<version>${scala.maven.version}</version>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
<scalaCompatVersion>${scala.compat.version}</scalaCompatVersion>
<failOnMultipleScalaVersions>true</failOnMultipleScalaVersions>
</configuration>
<executions>
Expand Down
8 changes: 4 additions & 4 deletions vavr/generator/Generator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,7 @@ def generateMainClasses(): Unit = {
}
""")}

${(i > 1) gen (1 to i).gen(j => xs"""
${(i > 1) `gen` (1 to i).gen(j => xs"""
/$javadoc
* Maps the ${j.ordinal} component of this tuple to a new value.
*
Expand Down Expand Up @@ -2173,7 +2173,7 @@ def generateMainClasses(): Unit = {
}
""")}

${(i < N) gen (1 to N-i).gen(j => xs"""
${(i < N) `gen` (1 to N-i).gen(j => xs"""
/$javadoc
* Concat a tuple's values to this tuple.
*
Expand Down Expand Up @@ -3625,7 +3625,7 @@ def generateTestClasses(): Unit = {
}
""")}

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

${(i < N) gen (1 to N-i).gen(j => xs"""
${(i < N) `gen` (1 to N-i).gen(j => xs"""
@$test
public void shouldConcatTuple$j() {
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")(", ")}));
Expand Down