Merge pull request #25106 from gsmet/scala-2.13

Upgrade to Scala 2.13
quarkusio · Apr 25, 2022 · b063dd4 · b063dd4
2 parents 6a81f60 + 48399c9
commit b063dd4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -139,7 +139,7 @@
         <snappy.version>1.1.8.4</snappy.version>
         <strimzi-test-container.version>0.100.0</strimzi-test-container.version>
         <!-- Scala is used by Kafka so we need to choose a compatible version -->
-        <scala.version>2.12.13</scala.version>
+        <scala.version>2.13.8</scala.version>
         <aws-lambda-java.version>1.2.1</aws-lambda-java.version>
         <aws-lambda-java-events.version>3.11.0</aws-lambda-java-events.version>
         <aws-xray.version>2.11.1</aws-xray.version>
@@ -3821,7 +3821,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
-                <artifactId>kafka_2.12</artifactId>
+                <artifactId>kafka_2.13</artifactId>
                 <version>${kafka3.version}</version>
                 <exclusions>
                     <exclusion>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -22,7 +22,7 @@
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <kotlin.version>1.6.21</kotlin.version>
         <dokka.version>1.6.10</dokka.version>
-        <scala.version>2.12.13</scala.version>
+        <scala.version>2.13.8</scala.version>
         <scala-maven-plugin.version>4.6.1</scala-maven-plugin.version>
         <!-- not pretty but this is used in the codestarts and we don't want to break compatibility -->
         <scala-plugin.version>${scala-maven-plugin.version}</scala-plugin.version>

diff --git a/...e-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/scala/pom.tpl.qute.xml b/...e-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/scala/pom.tpl.qute.xml
@@ -52,11 +52,10 @@
                         <arg>-deprecation</arg>
                         <arg>-feature</arg>
                         <arg>-explaintypes</arg>
-                        <arg>-target:jvm-1.8</arg>
-                        <arg>-Ypartial-unification</arg>
+                        <arg>-target:jvm-11</arg>
                     </args>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
@@ -103,8 +103,7 @@
                         <arg>-deprecation</arg>
                         <arg>-feature</arg>
                         <arg>-explaintypes</arg>
-                        <arg>-target:jvm-1.8</arg>
-                        <arg>-Ypartial-unification</arg>
+                        <arg>-target:jvm-11</arg>
                     </args>
                 </configuration>
             </plugin>