From 650f38ff6b3e2ddda70dbea738962b6e8b0cf050 Mon Sep 17 00:00:00 2001 From: Paul Maksimovich Date: Thu, 12 Dec 2024 17:30:26 -0800 Subject: [PATCH 1/2] upgrade zk and scala version --- .tool-versions | 1 + build.sbt | 4 ++-- version.sbt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.tool-versions b/.tool-versions index 2a6238e..5a5a252 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1,2 @@ sbt 1.3.13 +java adoptopenjdk-8.0.265+1 diff --git a/build.sbt b/build.sbt index f7e8900..e700480 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "com.socrata" name := "eurybates" -scalaVersion := "2.12.8" +scalaVersion := "2.13.6" crossScalaVersions := Seq(scalaVersion.value) @@ -12,7 +12,7 @@ mimaPreviousArtifacts := Set("com.socrata" %% "eurybates" % "2.1.0") libraryDependencies ++= Seq( "com.rojoma" %% "rojoma-json-v3" % "3.10.0", - "com.socrata" %% "socrata-zookeeper" % "1.1.0", + "com.socrata" %% "socrata-zookeeper" % "1.3.0", "org.apache.activemq" % "activemq-core" % "5.7.0" % "optional", "org.apache.kafka" % "kafka-clients" % "0.8.2.1" % "optional", "org.slf4j" % "slf4j-api" % "1.7.36", diff --git a/version.sbt b/version.sbt index cb02a29..216c404 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "2.1.1-SNAPSHOT" +ThisBuild / version := "2.1.1-SNAPSHOT" From 922925319c44e400058d2326c74e7ad7cdd64334 Mon Sep 17 00:00:00 2001 From: Paul Maksimovich Date: Thu, 12 Dec 2024 17:36:37 -0800 Subject: [PATCH 2/2] increment version --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 216c404..0498851 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "2.1.1-SNAPSHOT" +ThisBuild / version := "2.1.2-SNAPSHOT"