Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.7.7
56061eab46575cb88d2423dcfbf31b9ce2c96d13

# Scala Steward: Reformat with scalafmt 3.8.5
852e3d1f9fe0cf8faed8bd95a9b73dac3de3da81
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
runner.dialect = scala213source3
version = "3.8.3"
version = "3.8.5"
maxColumn = 120
docstrings.blankFirstLine = no
docstrings.style = SpaceAsterisk
Expand Down
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -202,5 +201,4 @@ lazy val crossVersionSharedSourcesScala3: Seq[Setting[_]] =
case Some((2, _)) => Seq(new File(dir.getPath + "_2"))
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading