From 67066ea50def8a045f59f6b13f086af59228fed7 Mon Sep 17 00:00:00 2001 From: Lynn Rozen Date: Tue, 24 May 2022 10:06:14 +0300 Subject: [PATCH 1/2] bumped up testcontainers-scala and snappy-java version to be compatible with M1 --- clients/spark/build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/spark/build.sbt b/clients/spark/build.sbt index 025b7bb186c..4e1f89acf7a 100644 --- a/clients/spark/build.sbt +++ b/clients/spark/build.sbt @@ -64,11 +64,11 @@ def generateCoreProject(buildType: BuildType) = // version will probably continue to work because the C language API // is quite stable. Take the version documented in DataBricks // Runtime 7.6, and note that it changes in 8.3 :-( - "org.xerial.snappy" % "snappy-java" % "1.1.7.5", + "org.xerial.snappy" % "snappy-java" % "1.1.8.2", "org.scalactic" %% "scalactic" % "3.2.9", "org.scalatest" %% "scalatest" % "3.2.9" % "test", - "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.39.5" % "test", - "com.dimafeng" %% "testcontainers-scala-munit" % "0.39.5" % "test", + "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.39.11" % "test", + "com.dimafeng" %% "testcontainers-scala-munit" % "0.39.11" % "test", "com.lihaoyi" %% "upickle" % "1.4.0" % "test", "com.lihaoyi" %% "os-lib" % "0.7.8" % "test" ), From 62e322cbffb5a58a9360675a242827c25d243e1c Mon Sep 17 00:00:00 2001 From: Lynn Rozen Date: Tue, 24 May 2022 16:36:46 +0300 Subject: [PATCH 2/2] updated also protoc, and bumped snappy-java version --- clients/spark/build.sbt | 4 ++-- clients/spark/project/protoc.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/spark/build.sbt b/clients/spark/build.sbt index 4e1f89acf7a..a24c3e3338b 100644 --- a/clients/spark/build.sbt +++ b/clients/spark/build.sbt @@ -39,7 +39,7 @@ def generateCoreProject(buildType: BuildType) = semanticdbEnabled := true, // enable SemanticDB semanticdbVersion := scalafixSemanticdb.revision, scalacOptions += "-Ywarn-unused-import", - PB.targets := Seq( + Compile / PB.targets := Seq( scalapb.gen() -> (Compile / sourceManaged).value / "scalapb" ), libraryDependencies ++= Seq( @@ -64,7 +64,7 @@ def generateCoreProject(buildType: BuildType) = // version will probably continue to work because the C language API // is quite stable. Take the version documented in DataBricks // Runtime 7.6, and note that it changes in 8.3 :-( - "org.xerial.snappy" % "snappy-java" % "1.1.8.2", + "org.xerial.snappy" % "snappy-java" % "1.1.8.4", "org.scalactic" %% "scalactic" % "3.2.9", "org.scalatest" %% "scalatest" % "3.2.9" % "test", "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.39.11" % "test", diff --git a/clients/spark/project/protoc.sbt b/clients/spark/project/protoc.sbt index 5eb5edb98b6..7b424ef6cdf 100644 --- a/clients/spark/project/protoc.sbt +++ b/clients/spark/project/protoc.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25") +addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") -libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.7" +libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.8"