diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 57e3a5d..1959f4b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -27,3 +27,6 @@ fade5fe3272078547e5ca2a7ef80a085a8d24b24 # Scala Steward: Reformat with scalafmt 3.9.1 ae9aadfa2b4779b5096a9004d6d7f5d9db2c2c7f + +# Scala Steward: Reformat with scalafmt 3.9.5 +86e22a329b56041cf014ca16e78ab03e8fd7df00 diff --git a/.scalafmt.conf b/.scalafmt.conf index 5759dc9..aaf7a7b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,6 +1,6 @@ style = defaultWithAlign maxColumn = 120 -version = 3.9.4 +version = 3.9.5 assumeStandardLibraryStripMargin = true align.stripMargin = true runner.dialect = scala3 \ No newline at end of file diff --git a/build.sbt b/build.sbt index 50bae8a..0e8d91f 100644 --- a/build.sbt +++ b/build.sbt @@ -5,8 +5,8 @@ Global / excludeLintKeys := Set(git.useGitDescribe, crossScalaVersions) lazy val rootScalaVersion = "3.3.5" lazy val crossVersions = Seq("2.13.16", rootScalaVersion) -lazy val flinkVersion1 = System.getProperty("flinkVersion1", "1.20.1") -lazy val flinkVersion2 = System.getProperty("flinkVersion2", "2.0.0") +lazy val flinkVersion1 = System.getProperty("flinkVersion1", "1.20.1") +lazy val flinkVersion2 = System.getProperty("flinkVersion2", "2.0.0") lazy val root = (project in file(".")) .aggregate(`scala-api-common`, `flink-1-api`, `flink-2-api`, `examples`) @@ -111,7 +111,7 @@ lazy val `scala-api-common` = (project in file("modules/flink-common-api")) .settings( name := "flink-scala-api-common", scalaVersion := rootScalaVersion, - crossScalaVersions := crossVersions, + crossScalaVersions := crossVersions, libraryDependencies ++= Seq( "org.apache.flink" % "flink-streaming-java" % flinkVersion1 % Provided ) @@ -177,9 +177,9 @@ lazy val `examples` = (project in file("modules/examples")) // Release process for the `examples` is not needed releaseProcess := Seq.empty[ReleaseStep], libraryDependencies ++= Seq( - "org.apache.flink" % "flink-runtime-web" % flinkVersion1 % Provided, - "org.apache.flink" % "flink-clients" % flinkVersion1 % Provided, - "org.apache.flink" % "flink-state-processor-api" % flinkVersion1 % Provided, + "org.apache.flink" % "flink-runtime-web" % flinkVersion1 % Provided, + "org.apache.flink" % "flink-clients" % flinkVersion1 % Provided, + "org.apache.flink" % "flink-state-processor-api" % flinkVersion1 % Provided, // Kafka Connector version is weird and to be set here manually "org.apache.flink" % "flink-connector-kafka" % s"3.4.0-1.20" % Provided, "org.apache.flink" % "flink-connector-files" % flinkVersion1 % Provided, diff --git a/modules/flink-1-api/src/test/scala-3/org/apache/flinkx/api/GenericCaseClassScala3Test.scala b/modules/flink-1-api/src/test/scala-3/org/apache/flinkx/api/GenericCaseClassScala3Test.scala index 038e758..49a1855 100644 --- a/modules/flink-1-api/src/test/scala-3/org/apache/flinkx/api/GenericCaseClassScala3Test.scala +++ b/modules/flink-1-api/src/test/scala-3/org/apache/flinkx/api/GenericCaseClassScala3Test.scala @@ -47,7 +47,7 @@ class GenericCaseClassScala3Test extends AnyFlatSpec with should.Matchers { } "Nested generics" should "be resolved correctly" in { - val intTypeInfo: TypeInformation[Option[Option[Int]]] = generateTypeInfo[Int] + val intTypeInfo: TypeInformation[Option[Option[Int]]] = generateTypeInfo[Int] val stringTypeInfo: TypeInformation[Option[Option[String]]] = generateTypeInfo[String] intTypeInfo shouldNot be theSameInstanceAs stringTypeInfo