From ea2dd77242d09a34e92573a9a331ed63d292175a Mon Sep 17 00:00:00 2001 From: Nabil Abdel-Hafeez <7283535+987Nabil@users.noreply.github.com> Date: Sat, 10 Aug 2024 11:13:19 +0200 Subject: [PATCH] Update dependencies --- build.sbt | 48 ++++++++++++++++++++------------------- project/BuildHelper.scala | 26 ++++++++++----------- project/plugins.sbt | 4 ++-- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/build.sbt b/build.sbt index 8d7831f37..7c77d3458 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,8 @@ import sbtcrossproject.CrossPlugin.autoImport._ import BuildHelper.{ crossProjectSettings, _ } import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ +Global / onChangedBuildSource := ReloadOnSourceChanges + inThisBuild( List( name := "zio-schema", @@ -127,13 +129,13 @@ lazy val zioSchemaMacros = crossProject(JSPlatform, JVMPlatform, NativePlatform) .nativeSettings(Test / fork := false) .nativeSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion ) ) .jsSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion, + "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion ) ) .settings(testDeps) @@ -157,13 +159,13 @@ lazy val zioSchema = crossProject(JSPlatform, JVMPlatform, NativePlatform) .nativeSettings(Test / fork := false) .nativeSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion ) ) .jsSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion, + "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion ) ) .settings(testDeps) @@ -212,13 +214,13 @@ lazy val zioSchemaDerivation = crossProject(JSPlatform, JVMPlatform, NativePlatf .nativeSettings(Test / fork := false) .nativeSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion ) ) .jsSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion, + "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion ) ) .settings(testDeps) @@ -241,13 +243,13 @@ lazy val zioSchemaJson = crossProject(JSPlatform, JVMPlatform, NativePlatform) .nativeSettings(Test / fork := false) .nativeSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion ) ) .jsSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion, + "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion ) ) .jsSettings(scalaJSLinkerConfig ~= { _.withOptimizer(false) }) @@ -268,13 +270,13 @@ lazy val zioSchemaProtobuf = crossProject(JSPlatform, JVMPlatform, NativePlatfor .nativeSettings(Test / fork := false) .nativeSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion ) ) .jsSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion, + "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion ) ) .settings(testDeps) @@ -292,8 +294,8 @@ lazy val zioSchemaThrift = project .settings(buildInfoSettings("zio.schema.thrift")) .settings( libraryDependencies ++= Seq( - "org.apache.thrift" % "libthrift" % thriftVersion, - "javax.annotation" % "javax.annotation-api" % javaxAnnotationApiVersion + "org.apache.thrift" % "libthrift" % thriftVersion, + "jakarta.annotation" % "jakarta.annotation-api" % javaxAnnotationApiVersion ) ) .settings(testDeps) @@ -359,13 +361,13 @@ lazy val zioSchemaOptics = crossProject(JSPlatform, JVMPlatform, NativePlatform) .nativeSettings(Test / fork := false) .nativeSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion ) ) .jsSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion, + "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion ) ) .settings(testDeps) @@ -389,13 +391,13 @@ lazy val zioSchemaExamples = crossProject(JSPlatform, JVMPlatform, NativePlatfor .nativeSettings(Test / fork := false) .nativeSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion ) ) .jsSettings( libraryDependencies ++= Seq( - "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" + "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion, + "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion ) ) .settings(testDeps) diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 6d7780c8b..1d4eca19a 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -26,20 +26,20 @@ object BuildHelper { val Scala213: String = versions("2.13") val Scala3: String = versions("3.3") - val zioVersion = "2.0.19" - val zioJsonVersion = "0.6.2" - val zioPreludeVersion = "1.0.0-RC21" - val zioOpticsVersion = "0.2.1" - val zioBsonVersion = "1.0.5" - val silencerVersion = "1.7.14" - val avroVersion = "1.11.3" - val bsonVersion = "4.11.1" - val zioConstraintlessVersion = "0.3.2" + val zioVersion = "2.1.7" + val zioJsonVersion = "0.7.1" + val zioPreludeVersion = "1.0.0-RC28" + val zioOpticsVersion = "0.2.2" + val zioBsonVersion = "1.0.6" + val avroVersion = "1.12.0" + val bsonVersion = "4.11.3" + val zioConstraintlessVersion = "0.3.3" val scalaCollectionCompatVersion = "2.10.0" - val msgpackVersion = "0.9.6" - val jacksonScalaVersion = "2.15.2" - val thriftVersion = "0.16.0" - val javaxAnnotationApiVersion = "1.3.2" + val msgpackVersion = "0.9.8" + val jacksonScalaVersion = "2.17.2" + val thriftVersion = "0.20.0" + val javaxAnnotationApiVersion = "1.3.5" + val scalaJavaTimeVersion = "2.6.0" def macroDefinitionSettings = Seq( scalacOptions += "-language:experimental.macros", diff --git a/project/plugins.sbt b/project/plugins.sbt index a16d7d128..c55a5cc1f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,12 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6") addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.4.0-alpha.22")