Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update STTP and Scala Native versions #2427

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Update STTP and Scala Native versions #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
728e147
Update sttp and Scala Native versions
kyri-petrou Oct 4, 2024
4fdff95
Use `%%%` for jsoniter in JS/Native
kyri-petrou Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
- restore_cache:
key: sbtcache
- run: ./.circleci/install-native-deps.sh
- run: sbt ++2.13 clientJS/test clientLaminextJS/Test/fastLinkJS clientNative/Test/nativeLink
- run: sbt ++2.13 clientJS/test clientLaminextJS/Test/fastLinkJS clientNative/test
- save_cache:
key: sbtcache
paths:
Expand All @@ -145,7 +145,7 @@ jobs:
- restore_cache:
key: sbtcache
- run: ./.circleci/install-native-deps.sh
- run: sbt ++3.3 clientJS/test clientLaminextJS/Test/fastLinkJS clientNative/Test/nativeLink
- run: sbt ++3.3 clientJS/test clientLaminextJS/Test/fastLinkJS clientNative/test
- save_cache:
key: sbtcache
paths:
Expand Down
22 changes: 10 additions & 12 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ val catsMtlVersion = "1.3.0"
val circeVersion = "0.14.10"
val fs2Version = "3.11.0"
val http4sVersion = "0.23.28"
val javaTimeVersion = "2.5.0"
val javaTimeVersion = "2.6.0"
val jsoniterVersion = "2.30.14"
val laminextVersion = "0.17.0"
val magnoliaScala2Version = "1.1.10"
Expand All @@ -22,7 +22,7 @@ val pekkoHttpVersion = "1.1.0"
val playVersion = "3.0.5"
val playJsonVersion = "3.0.4"
val scalafmtVersion = "3.8.0"
val sttpVersion = "3.9.8"
val sttpVersion = "3.10.0"
val tapirVersion = "1.11.5"
val zioVersion = "2.1.9"
val zioInteropCats2Version = "22.0.0.0"
Expand Down Expand Up @@ -450,14 +450,12 @@ lazy val client = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.disablePlugins(AssemblyPlugin)
.settings(
libraryDependencies ++= Seq(
"com.softwaremill.sttp.client3" %%% "core" % sttpVersion,
"com.softwaremill.sttp.client3" %%% "jsoniter" % sttpVersion,
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % jsoniterVersion,
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % jsoniterVersion % Provided,
// keep an older zio version because we're still on Native 0.4.x
// it's only for tests so no big deal
"dev.zio" %%% "zio-test" % "2.1.6" % Test,
"dev.zio" %%% "zio-test-sbt" % "2.1.6" % Test
"com.softwaremill.sttp.client3" %%% "core" % sttpVersion,
"com.softwaremill.sttp.client3" %%% "jsoniter" % sttpVersion,
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % jsoniterVersion,
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-macros" % jsoniterVersion % Provided,
"dev.zio" %%% "zio-test" % zioVersion % Test,
"dev.zio" %%% "zio-test-sbt" % zioVersion % Test
)
)
lazy val clientJVM = client.jvm.settings(enableMimaSettingsJVM)
Expand All @@ -467,7 +465,7 @@ lazy val clientJS = client.js
libraryDependencies ++= {
Seq(
"org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0" cross CrossVersion.for3Use2_13,
"io.github.cquiroz" %%% "scala-java-time" % "2.5.0" % Test
"io.github.cquiroz" %%% "scala-java-time" % javaTimeVersion % Test
)
}
)
Expand All @@ -477,7 +475,7 @@ lazy val clientJS = client.js
lazy val clientNative = client.native
.settings(
libraryDependencies ++= Seq(
"com.github.lolgab" %%% "scala-native-crypto" % "0.0.4",
"com.github.lolgab" %%% "scala-native-crypto" % "0.1.0",
"io.github.cquiroz" %%% "scala-java-time" % javaTimeVersion % Test
),
Test / fork := false
Expand Down
4 changes: 2 additions & 2 deletions codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ lazy val calibanLib: Seq[ModuleID] =
}

lazy val sttp = Seq(
"com.softwaremill.sttp.client3" %% "core" % "3.9.8",
"com.softwaremill.sttp.client3" %% "zio" % "3.9.8"
"com.softwaremill.sttp.client3" %% "core" % "3.10.0",
"com.softwaremill.sttp.client3" %% "zio" % "3.10.0"
)

// ### App Modules ###
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ val sbtcrossProjectVersion = "1.3.2"
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % sbtcrossProjectVersion)
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % sbtcrossProjectVersion)
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
Expand Down