Skip to content

Commit

Permalink
Update scio to 0.14.8
Browse files Browse the repository at this point in the history
Levegrage BOM to avoid deps conflict
  • Loading branch information
RustedBones committed Oct 16, 2024
1 parent 483709b commit 26169e3
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 12 deletions.
7 changes: 0 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
// see https://github.com/spotify/scio/blob/v0.14.2/build.sbt
val scioVersion = "0.14.2"
val beamVersion = "2.54.0"
val slf4jVersion = "1.7.30"
val flinkVersion = "1.16.0"
val sparkVersion = "3.5.0"

lazy val root = project
.in(file("."))
.settings(
Expand Down
45 changes: 40 additions & 5 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
@@ -1,22 +1,40 @@
import sbt._
import Keys._
import com.here.bom.Bom
$if(DataflowFlexTemplate.truthy)$
import com.typesafe.sbt.packager.docker._
import scala.sys.process._
import complete.DefaultParsers._
$endif$


// see https://github.com/spotify/scio/blob/v0.14.2/build.sbt
val scioVersion = "0.14.2"
val beamVersion = "2.54.0"
val scioVersion = "0.14.8"
val beamVersion = "2.59.0"

val gcpLibrariesVersion = "26.39.0"
val guavaVersion = "33.1.0-jre"
val jacksonVersion = "2.15.4"
val magnolifyVersion = "0.7.4"
val nettyVersion = "4.1.100.Final"
val slf4jVersion = "1.7.30"

$if(FlinkRunner.truthy)$
val flinkVersion = "1.16.0"
val flinkVersion = "1.18.0"
$endif$
$if(SparkRunner.truthy)$
val sparkVersion = "3.5.0"
$endif$


lazy val beamBom = Bom("org.apache.beam" % "beam-sdks-java-bom" % beamVersion)
lazy val gcpBom = Bom("com.google.cloud" % "libraries-bom" % gcpLibrariesVersion)
lazy val guavaBom = Bom("com.google.guava" % "guava-bom" % guavaVersion)
lazy val jacksonBom = Bom("com.fasterxml.jackson" % "jackson-bom" % jacksonVersion)
lazy val magnolifyBom = Bom("com.spotify" % "magnolify-bom" % magnolifyVersion)
lazy val nettyBom = Bom("io.netty" % "netty-bom" % nettyVersion)
lazy val scioBom = Bom("com.spotify" % "scio-bom" % scioVersion)

$if(DataflowFlexTemplate.truthy)$
lazy val gcpProject = settingKey[String]("GCP Project")
lazy val gcpRegion = settingKey[String]("GCP region")
Expand All @@ -25,11 +43,28 @@ lazy val gcpDataflowFlexTemplateBuild = inputKey[Unit]("create dataflow flex-tem
lazy val gcpDataflowFlexTemplateRun = inputKey[Unit]("run dataflow flex-template")
$endif$

lazy val commonSettings = Def.settings(

val bomSettings = Def.settings(
beamBom,
gcpBom,
guavaBom,
jacksonBom,
magnolifyBom,
nettyBom,
dependencyOverrides ++=
beamBom.key.value.bomDependencies ++
gcpBom.key.value.bomDependencies ++
guavaBom.key.value.bomDependencies ++
jacksonBom.key.value.bomDependencies ++
magnolifyBom.key.value.bomDependencies ++
nettyBom.key.value.bomDependencies
)

lazy val commonSettings = bomSettings ++ Def.settings(
organization := "$organization$",
// Semantic versioning http://semver.org/
version := "0.1.0-SNAPSHOT",
scalaVersion := "2.13.13",
scalaVersion := "2.13.15",
scalacOptions ++= Seq(
"-release", "8",
"-deprecation",
Expand Down
1 change: 1 addition & 0 deletions src/main/g8/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
addDependencyTreePlugin
addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.16")
$if(DataflowFlexTemplate.truthy) $
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
$endif$

0 comments on commit 26169e3

Please sign in to comment.