Skip to content

Commit 37add1e

Browse files
authored
Merge branch 'main' into docker-init
2 parents 2b0fb21 + a68cf26 commit 37add1e

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

build.sbt

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import sbt.Tests.{Group, SubProcess}
1717
// java incompatibility is probably not an issue, hopefully we can cross build flink 1.17 & 1.18 without code changes
1818

1919
lazy val scala_2_12 = "2.12.18"
20+
lazy val scala_2_13 = "2.13.14"
21+
2022
// spark deps: https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12/3.5.0
2123
// avro 1.11.2, jackson: 2.15.2
2224
lazy val spark_3_5 = "3.5.1"
@@ -48,7 +50,7 @@ inThisBuild(
4850
lazy val supportedVersions = List(scala_2_12) // List(scala211, scala212, scala213)
4951

5052
lazy val root = (project in file("."))
51-
.aggregate(api, aggregator, online, spark, flink, cloud_gcp)
53+
.aggregate(api, aggregator, online, spark, flink, cloud_gcp, hub)
5254
.settings(name := "chronon")
5355

5456
val spark_sql = Seq(
@@ -91,7 +93,6 @@ lazy val api = project
9193
}.taskValue,
9294
crossScalaVersions := supportedVersions,
9395
libraryDependencies ++= spark_sql_provided,
94-
9596
libraryDependencies ++= Seq(
9697
"org.apache.thrift" % "libthrift" % "0.13.0", // cannot upgrade this without breaking compatibility
9798
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
@@ -100,16 +101,16 @@ lazy val api = project
100101
"org.scalatest" %% "scalatest" % "3.2.19" % "test",
101102
"org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % "test"
102103
)
103-
)
104+
)
104105

105106
lazy val aggregator = project
106107
.dependsOn(api.%("compile->compile;test->test"))
107108
.settings(
108109
libraryDependencies ++= Seq(
109-
"com.yahoo.datasketches" % "sketches-core" % "0.13.4",
110-
"com.google.code.gson" % "gson" % "2.10.1"
111-
),
112-
libraryDependencies ++= spark_sql_provided,
110+
"com.yahoo.datasketches" % "sketches-core" % "0.13.4",
111+
"com.google.code.gson" % "gson" % "2.10.1"
112+
),
113+
libraryDependencies ++= spark_sql_provided
113114
)
114115

115116
// todo add a service module with spark as a hard dependency
@@ -129,7 +130,6 @@ lazy val online = project
129130
libraryDependencies ++= flink_all.map(_ % "provided")
130131
)
131132

132-
133133
lazy val tmp_warehouse = "/tmp/chronon/"
134134
def cleanSparkMeta(): Unit = {
135135
Folder.clean(file(".") / "spark" / "spark-warehouse",
@@ -158,7 +158,7 @@ lazy val spark = project
158158
crossScalaVersions := supportedVersions,
159159
libraryDependencies ++= spark_all_provided,
160160
libraryDependencies ++= spark_all.map(_ % "test"),
161-
libraryDependencies += "jakarta.servlet" % "jakarta.servlet-api" % "4.0.3",
161+
libraryDependencies += "jakarta.servlet" % "jakarta.servlet-api" % "4.0.3"
162162
)
163163

164164
lazy val flink = project
@@ -177,12 +177,24 @@ lazy val cloud_gcp = project
177177
libraryDependencies ++= spark_all
178178
)
179179

180+
lazy val hub = (project in file("hub"))
181+
.enablePlugins(PlayScala)
182+
.settings(
183+
name := "hub",
184+
// play dropped support for Scala 2.12 in release 2.9
185+
scalaVersion := scala_2_13,
186+
libraryDependencies ++= Seq(
187+
guice,
188+
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test
189+
)
190+
)
191+
180192
ThisBuild / assemblyMergeStrategy := {
181193
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
182-
case PathList("META-INF", _*) => MergeStrategy.filterDistinctLines
194+
case PathList("META-INF", _*) => MergeStrategy.filterDistinctLines
183195
case "plugin.xml" => MergeStrategy.last
184-
case PathList("com", "fasterxml", _*) => MergeStrategy.last
185-
case PathList("com", "google", _*) => MergeStrategy.last
196+
case PathList("com", "fasterxml", _*) => MergeStrategy.last
197+
case PathList("com", "google", _*) => MergeStrategy.last
186198
case _ => MergeStrategy.first
187199
}
188200
exportJars := true

project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0")
77
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
88
addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.1.1")
99
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
10+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5")

0 commit comments

Comments
 (0)