diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index b951b804..28bb6f10 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -45,3 +45,6 @@ b83264042216c7d83b73247b8b7a998902ec26d5 # Scala Steward: Reformat with scalafmt 3.9.10 7d900f00d9e3f23f45fca7989ae6a4c1c75580c7 + +# Scala Steward: Reformat with scalafmt 3.10.0 +12eaae6b3f4f112a41e4e69dc5c7109ba0296dcd diff --git a/.scalafmt.conf b/.scalafmt.conf index e72ec1e1..fd0679e7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,6 +1,6 @@ style = defaultWithAlign maxColumn = 120 -version = 3.9.10 +version = 3.10.0 assumeStandardLibraryStripMargin = true align.stripMargin = true runner.dialect = scala3 \ No newline at end of file diff --git a/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/typeinfo/SimpleTypeInfo.scala b/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/typeinfo/SimpleTypeInfo.scala index d4d1fa57..9de231a5 100644 --- a/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/typeinfo/SimpleTypeInfo.scala +++ b/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/typeinfo/SimpleTypeInfo.scala @@ -15,7 +15,7 @@ final case class SimpleTypeInfo[T: ClassTag: TypeSerializer]( keyType: Boolean = false ) extends TypeInformation[T] { - val typeClass: Class[T] = classTag[T].runtimeClass.asInstanceOf[Class[T]] + val typeClass: Class[T] = classTag[T].runtimeClass.asInstanceOf[Class[T]] val serializer: TypeSerializer[T] = implicitly[TypeSerializer[T]] override def createSerializer(config: SerializerConfig): TypeSerializer[T] = serializer.duplicate() diff --git a/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SchemaEvolutionTest.scala b/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SchemaEvolutionTest.scala index cc403a09..630f1aaa 100644 --- a/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SchemaEvolutionTest.scala +++ b/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SchemaEvolutionTest.scala @@ -50,7 +50,7 @@ class SchemaEvolutionTest extends AnyFlatSpec with Matchers { modifiedResult shouldBe modifiedExpected } - def generateBlobForEvent() = { + def generateBlobForEvent() = { val buffer = new ByteArrayOutputStream() val eventSerializer = createSerializer[Event] eventSerializer.serialize(Click("p1", clicks), new DataOutputViewStreamWrapper(buffer)) diff --git a/project/plugins.sbt b/project/plugins.sbt index 79886ce1..e1c1383b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ // addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") // addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.2") -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.2") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") // addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") -addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.3") -addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.1.11") \ No newline at end of file +addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.3") +addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.1.11")