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.8.3
5aa36543339334fc0e3081dd86c8c38f8826915a

# Scala Steward: Reformat with scalafmt 3.8.6
f49d7254abd0239e6a576d9fc144ec6e0c4c2184
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.6
runner.dialect = scala213source3

maxColumn = 120
Expand Down
12 changes: 6 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import sbt.*

object Dependencies {
val scio = "com.spotify" %% "scio-core" % "0.14.9"
val scio = "com.spotify" %% "scio-core" % "0.14.11"

val scioGcp = "com.spotify" %% "scio-google-cloud-platform" % "0.14.9" excludeAll (
val scioGcp = "com.spotify" %% "scio-google-cloud-platform" % "0.14.11" excludeAll (
ExclusionRule(organization = "org.apache.beam", name = "beam-runners-direct-java")
)

val scioTest = "com.spotify" %% "scio-test" % "0.14.9" excludeAll (
val scioTest = "com.spotify" %% "scio-test" % "0.14.11" excludeAll (
ExclusionRule(organization = "org.apache.beam", name = "beam-runners-direct-java")
)

val beamDirectRunner = "org.apache.beam" % "beam-runners-direct-java" % "2.61.0"
val beamDataflowRunner = "org.apache.beam" % "beam-runners-google-cloud-dataflow-java" % "2.61.0"
val beamDirectRunner = "org.apache.beam" % "beam-runners-direct-java" % "2.62.0"
val beamDataflowRunner = "org.apache.beam" % "beam-runners-google-cloud-dataflow-java" % "2.62.0"

val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"

val slf4j = "org.slf4j" % "slf4j-api" % "2.0.16"
val slf4jJcl = "org.slf4j" % "jcl-over-slf4j" % "2.0.16"

val logback = "ch.qos.logback" % "logback-classic" % "1.5.15"
val logback = "ch.qos.logback" % "logback-classic" % "1.5.16"

val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19"
val scalaTestPlusScalaCheck = "org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0"
Expand Down
2 changes: 1 addition & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import scalafix.sbt.ScalafixPlugin.autoImport.*

object Settings {
val commonSettings = Seq(
scalaVersion := "2.13.15",
scalaVersion := "2.13.16",
scalacOptions := Seq(
"-deprecation", // Emit warning and location for usages of deprecated APIs
"-feature", // Emit warning and location for usages of features that should be imported explicitly
Expand Down
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// test coverage
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.5.0")
// code formatting
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
// code analysis
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.8")
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.10")
// automated code changes
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
// fat-jar for flex templates
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class BigQueryPropertyTest extends AnyFlatSpec with Matchers

behavior of "BigQuery syntax"

it should "write and read" in {
it should "write and read" in
withDataset { datasetName =>
withTable(datasetName, SampleClassBigQuerySchema) { tableName =>
val samples = sampleObjects()
Expand Down Expand Up @@ -74,7 +74,6 @@ class BigQueryPropertyTest extends AnyFlatSpec with Matchers
}
}
}
}
}

object BigQueryPropertyTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,19 @@ class JsonSerdeTest extends AnyFlatSpec

behavior of "JsonSerde"

it should "serialize and deserialize sample type using string" in {
it should "serialize and deserialize sample type using string" in
forAll { sample: SampleClass =>
val serialized = writeJsonAsString(sample)
val deserialized = readJsonFromString[SampleClass](serialized)
deserialized.success.value shouldMatchTo sample
}
}

it should "serialize and deserialize sample type using bytes" in {
it should "serialize and deserialize sample type using bytes" in
forAll { sample: SampleClass =>
val serialized = writeJsonAsBytes(sample)
val deserialized = readJsonFromBytes[SampleClass](serialized)
deserialized.success.value shouldMatchTo sample
}
}

it should "serialize and deserialize parametrized type using string" in {
val parametrized = ParametrizedClass("field")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class TollBatchJobTest extends AnyFlatSpec with Matchers
with VehicleRegistrationFixture
with VehiclesWithExpiredRegistrationFixture {

"Toll job" should "run in the batch mode" in {
"Toll job" should "run in the batch mode" in
JobTest[TollBatchJob.type]
.args(
"--effectiveDate=2014-09-10",
Expand Down Expand Up @@ -87,5 +87,4 @@ class TollBatchJobTest extends AnyFlatSpec with Matchers
results should beEmpty
}
.run()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TollBoothEntryTest extends AnyFlatSpec with Matchers
}

it should "throw an exception for invalid record" in {
val thrown = the[RuntimeException] thrownBy {
val thrown = the[RuntimeException] thrownBy
runWithScioContext { sc =>
val invalidRecord = anyTollBoothEntryRecord.copy(id = "")

Expand All @@ -73,7 +73,6 @@ class TollBoothEntryTest extends AnyFlatSpec with Matchers
decodeRecord(sc.testBounded(inputs))

}
}
thrown.getMessage should include("Toll booth id is empty")
}
}
Loading