Merge branch 'master' into update/scala3-compiler-3.3.4

flink-extended · Oct 4, 2024 · d863acc · d863acc
2 parents 6537181 + 477e99c
commit d863acc
Show file tree

Hide file tree

Showing 3 changed files with 23,020 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         java: [11]
-        scala: [2.12.20, 2.13.14, 3.3.4]
+        scala: [2.12.20, 2.13.15, 3.3.4]
         flink: [1.17.2, 1.18.1]
         include:
           - scala: 3.3.4

diff --git a/build.sbt b/build.sbt
@@ -17,7 +17,7 @@ lazy val `scala-api` = (project in file("modules/scala-api"))
   .settings(
     name               := "flink-scala-api",
     scalaVersion       := rootScalaVersion,
-    crossScalaVersions := Seq("2.12.20", "2.13.14", rootScalaVersion),
+    crossScalaVersions := Seq("2.12.20", "2.13.15", rootScalaVersion),
     libraryDependencies ++= Seq(
       "org.apache.flink"  % "flink-streaming-java" % flinkVersion,
       "org.apache.flink"  % "flink-java"           % flinkVersion,