From 5190f8ff13c61b48e5b1143db4a461a7cf759932 Mon Sep 17 00:00:00 2001
From: Achilleas Naoumidis <achinaou@gmail.com>
Date: Sun, 29 Sep 2024 07:49:09 +0300
Subject: [PATCH] Update Scala to 3.5

---
 pom.xml                        | 6 ++----
 vavr/generator/Generator.scala | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e92d7b20..0d6b12ed3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
diff --git a/vavr/generator/Generator.scala b/vavr/generator/Generator.scala
index 663f35861..e0468c23d 100644
--- a/vavr/generator/Generator.scala
+++ b/vavr/generator/Generator.scala
@@ -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.
                *
@@ -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.
                *
@@ -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")(", ")
@@ -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")(", ")}));