From 3be247981369c8e9d1ea42d5d9d0e340045a3399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Sowa?= Date: Wed, 3 Jul 2024 17:07:06 +0200 Subject: [PATCH] Version bumps --- build.sbt | 48 +++++++++---------- .../directives/ParameterDirectivesSpec.scala | 8 ++-- project/build.properties | 2 +- project/plugins.sbt | 8 ++-- 4 files changed, 32 insertions(+), 34 deletions(-) diff --git a/build.sbt b/build.sbt index 74e88d0..e4d67b0 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,5 @@ -import scala.collection.immutable.Seq - -val scala_2_13 = "2.13.10" -val scala_3 = "3.3.0" +val scala_2_13 = "2.13.14" +val scala_3 = "3.3.3" val mainScalaVersion = scala_3 val supportedScalaVersions = Seq(scala_2_13, scala_3) @@ -56,26 +54,26 @@ lazy val baseSettings = Seq( scalafmtOnCompile := true) val http4s = Seq( - "org.http4s" %% "http4s-dsl" % "0.23.23", - "org.http4s" %% "http4s-ember-server" % "0.23.23") + "org.http4s" %% "http4s-dsl" % "0.23.27", + "org.http4s" %% "http4s-ember-server" % "0.23.27") val http4sClient = Seq( - "org.http4s" %% "http4s-ember-client" % "0.23.23") + "org.http4s" %% "http4s-ember-client" % "0.23.27") val circe = Seq( - "io.circe" %% "circe-core" % "0.14.5", - "io.circe" %% "circe-generic" % "0.14.5", - "io.circe" %% "circe-parser" % "0.14.5", - "org.http4s" %% "http4s-circe" % "0.23.23") + "io.circe" %% "circe-core" % "0.14.9", + "io.circe" %% "circe-generic" % "0.14.9", + "io.circe" %% "circe-parser" % "0.14.9", + "org.http4s" %% "http4s-circe" % "0.23.27") val logback = Seq( - "ch.qos.logback" % "logback-classic" % "1.4.11") + "ch.qos.logback" % "logback-classic" % "1.5.6") lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Pure) .in(file("core")) - .settings(baseSettings: _*) + .settings(baseSettings *) .settings( name := "http4s-stir", libraryDependencies ++= http4s, @@ -83,13 +81,13 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) lazy val coreTests = project .in(file("core-tests")) - .settings(baseSettings: _*) - .settings(noPublishSettings: _*) + .settings(baseSettings *) + .settings(noPublishSettings *) .settings( name := "http4s-stir-tests", libraryDependencies ++= http4s ++ circe ++ Seq( - "org.scalatest" %% "scalatest" % "3.2.16" % Test, - "org.specs2" %% "specs2-core" % "4.20.2" % Test)).dependsOn( + "org.scalatest" %% "scalatest" % "3.2.19" % Test, + "org.specs2" %% "specs2-core" % "4.20.7" % Test)).dependsOn( testkit.jvm % "test", core.jvm % "test->test") @@ -97,23 +95,23 @@ lazy val testkit = crossProject(JSPlatform, JVMPlatform, NativePlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Pure) .in(file("testkit")) - .settings(baseSettings: _*) + .settings(baseSettings *) .settings( name := "http4s-stir-testkit", libraryDependencies ++= http4s ++ http4sClient ++ Seq( - "org.scalatest" %% "scalatest" % "3.2.16" % "provided", - "org.specs2" %% "specs2-core" % "4.20.2" % "provided")).dependsOn(core) + "org.scalatest" %% "scalatest" % "3.2.19" % "provided", + "org.specs2" %% "specs2-core" % "4.20.7" % "provided")).dependsOn(core) lazy val examples = project .in(file("examples")) - .settings(baseSettings: _*) - .settings(noPublishSettings: _*) + .settings(baseSettings *) + .settings(noPublishSettings *) .settings( name := "http4s-stir-examples", libraryDependencies ++= http4s ++ circe ++ logback ++ Seq( - "org.specs2" %% "specs2-core" % "4.20.2" % Test, - "org.scalatest" %% "scalatest" % "3.2.16" % Test)) + "org.specs2" %% "specs2-core" % "4.20.7" % Test, + "org.scalatest" %% "scalatest" % "3.2.19" % Test)) .dependsOn(core.jvm, testkit.jvm % Test) lazy val root = tlCrossRootProject.aggregate(core, testkit, examples, coreTests) - .settings(baseSettings: _*) + .settings(baseSettings *) diff --git a/core-tests/src/test/scala/pl/iterators/stir/server/directives/ParameterDirectivesSpec.scala b/core-tests/src/test/scala/pl/iterators/stir/server/directives/ParameterDirectivesSpec.scala index 2f52702..e65f916 100644 --- a/core-tests/src/test/scala/pl/iterators/stir/server/directives/ParameterDirectivesSpec.scala +++ b/core-tests/src/test/scala/pl/iterators/stir/server/directives/ParameterDirectivesSpec.scala @@ -340,7 +340,7 @@ class ParameterDirectivesSpec extends AnyFreeSpec with GenericRoutingSpec with I echoComplete } } ~> check { - responseAs[String] shouldEqual "Vector()" + responseAs[String] shouldEqual "List()" } } "extract all occurrences into an Iterable when parameter is present" in { @@ -349,7 +349,7 @@ class ParameterDirectivesSpec extends AnyFreeSpec with GenericRoutingSpec with I echoComplete } } ~> check { - responseAs[String] shouldEqual "Vector(cooking, reading)" + responseAs[String] shouldEqual "List(cooking, reading)" } } "extract as Iterable[Int]" in { @@ -358,7 +358,7 @@ class ParameterDirectivesSpec extends AnyFreeSpec with GenericRoutingSpec with I echoComplete } } ~> check { - responseAs[String] shouldEqual "Vector(3, 5)" + responseAs[String] shouldEqual "List(3, 5)" } } "extract as Iterable[Int] with an explicit deserializer" in { @@ -367,7 +367,7 @@ class ParameterDirectivesSpec extends AnyFreeSpec with GenericRoutingSpec with I echoComplete } } ~> check { - responseAs[String] shouldEqual "Vector(3, 10)" + responseAs[String] shouldEqual "List(3, 10)" } } } diff --git a/project/build.properties b/project/build.properties index 52413ab..081fdbb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.10.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index 66874a4..a7d001a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,9 +4,9 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") //addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.5.0-RC11") -addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.7") \ No newline at end of file +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.1") +addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.9") \ No newline at end of file