From ffc8c88afdf1f20059ee2d020550f8a323f78984 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 18 Jan 2025 17:39:08 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.5 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9b79acbf..d8edc140 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ runner.dialect = scala213source3 -version = "3.8.3" +version = "3.8.5" maxColumn = 120 docstrings.blankFirstLine = no docstrings.style = SpaceAsterisk From 852e3d1f9fe0cf8faed8bd95a9b73dac3de3da81 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 18 Jan 2025 17:39:25 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.5 Executed command: scalafmt --non-interactive --- build.sbt | 6 ++---- .../cassandra/CassandraTypeConversionSpec.scala | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index b4742af2..ca1ed621 100644 --- a/build.sbt +++ b/build.sbt @@ -178,7 +178,7 @@ lazy val examples = (project in file("examples")) lazy val crossVersionSharedSources: Seq[Setting[_]] = Seq(Compile, Test).map { sc => - (sc / unmanagedSourceDirectories) ++= { + (sc / unmanagedSourceDirectories) ++= (sc / unmanagedSourceDirectories).value.flatMap { dir: File => if (dir.getName != "scala") Seq(dir) else @@ -188,12 +188,11 @@ lazy val crossVersionSharedSources: Seq[Setting[_]] = case Some((2, y)) if y >= 11 => Seq(new File(dir.getPath + "_2.13-")) } } - } } lazy val crossVersionSharedSourcesScala3: Seq[Setting[_]] = Seq(Compile, Test).map { sc => - (sc / unmanagedSourceDirectories) ++= { + (sc / unmanagedSourceDirectories) ++= (sc / unmanagedSourceDirectories).value.flatMap { dir: File => if (dir.getName != "scala") Seq(dir) else @@ -202,5 +201,4 @@ lazy val crossVersionSharedSourcesScala3: Seq[Setting[_]] = case Some((2, _)) => Seq(new File(dir.getPath + "_2")) } } - } } diff --git a/cassandra/src/test/scala/org/datatools/bigdatatypes/cassandra/CassandraTypeConversionSpec.scala b/cassandra/src/test/scala/org/datatools/bigdatatypes/cassandra/CassandraTypeConversionSpec.scala index 0d0a0259..2efa71dd 100644 --- a/cassandra/src/test/scala/org/datatools/bigdatatypes/cassandra/CassandraTypeConversionSpec.scala +++ b/cassandra/src/test/scala/org/datatools/bigdatatypes/cassandra/CassandraTypeConversionSpec.scala @@ -34,9 +34,8 @@ class CassandraTypeConversionSpec extends UnitSpec { CassandraTestTypes.extendedTypes.asSqlType shouldBe SqlTypeConversion[ExtendedTypes].getType } - "Cassandra schema with Repeated types" should "be converted into Struct with repeated types" in { + "Cassandra schema with Repeated types" should "be converted into Struct with repeated types" in CassandraTestTypes.basicWithList.asSqlType - } "Cassandra Create Table" should "be converted into SqlTypes, using extension method" in { val table: CreateTable = CassandraTables.table[BasicTypes]("TestTable", "myLong") From ef40f8b0d02302fbc3ac72ff6b6b606bdc99f6d8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 18 Jan 2025 17:39:25 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 6d48ec12..091dfd7f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.7.7 56061eab46575cb88d2423dcfbf31b9ce2c96d13 + +# Scala Steward: Reformat with scalafmt 3.8.5 +852e3d1f9fe0cf8faed8bd95a9b73dac3de3da81