From 7da5eb1f4175166511d4e7038e2071492074394a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kiersznowski?= Date: Fri, 5 Jul 2024 13:51:00 +0200 Subject: [PATCH 1/3] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e4d67b0..3141f84 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(R RefPredicate.Equals(Ref.Branch("master"))) ThisBuild / tlBaseVersion := "0.3" ThisBuild / tlCiHeaderCheck := false -ThisBuild / tlSonatypeUseLegacyHost := true +ThisBuild / tlSonatypeUseLegacyHost := false lazy val noPublishSettings = Seq( From eb352fd909845d1b087bf8f70a02d43da15443d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kiersznowski?= Date: Fri, 5 Jul 2024 14:02:04 +0200 Subject: [PATCH 2/3] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3141f84..e4d67b0 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(R RefPredicate.Equals(Ref.Branch("master"))) ThisBuild / tlBaseVersion := "0.3" ThisBuild / tlCiHeaderCheck := false -ThisBuild / tlSonatypeUseLegacyHost := false +ThisBuild / tlSonatypeUseLegacyHost := true lazy val noPublishSettings = Seq( From c0619b21e171fb7679851657287538f6953d687e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Sowa?= Date: Mon, 7 Oct 2024 22:48:27 +0200 Subject: [PATCH 3/3] Bumping deps, mainly for SN 0.5 (#5) * Bumping deps, mainly for SN 0.5 * Updating ci.yml --- .github/workflows/ci.yml | 12 ++++++++++++ build.sbt | 26 +++++++++++++------------- project/plugins.sbt | 8 ++++---- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c07689e..fee08e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,10 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: + - name: Install sbt + if: contains(runner.os, 'macos') + run: brew install sbt + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -117,6 +121,10 @@ jobs: java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + if: contains(runner.os, 'macos') + run: brew install sbt + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -241,6 +249,10 @@ jobs: java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + if: contains(runner.os, 'macos') + run: brew install sbt + - name: Checkout current branch (full) uses: actions/checkout@v4 with: diff --git a/build.sbt b/build.sbt index e4d67b0..1f8f279 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ -val scala_2_13 = "2.13.14" -val scala_3 = "3.3.3" +val scala_2_13 = "2.13.15" +val scala_3 = "3.3.4" val mainScalaVersion = scala_3 val supportedScalaVersions = Seq(scala_2_13, scala_3) @@ -54,20 +54,20 @@ lazy val baseSettings = Seq( scalafmtOnCompile := true) val http4s = Seq( - "org.http4s" %% "http4s-dsl" % "0.23.27", - "org.http4s" %% "http4s-ember-server" % "0.23.27") + "org.http4s" %% "http4s-dsl" % "0.23.28", + "org.http4s" %% "http4s-ember-server" % "0.23.28") val http4sClient = Seq( - "org.http4s" %% "http4s-ember-client" % "0.23.27") + "org.http4s" %% "http4s-ember-client" % "0.23.28") val circe = Seq( - "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") + "io.circe" %% "circe-core" % "0.14.10", + "io.circe" %% "circe-generic" % "0.14.10", + "io.circe" %% "circe-parser" % "0.14.10", + "org.http4s" %% "http4s-circe" % "0.23.28") val logback = Seq( - "ch.qos.logback" % "logback-classic" % "1.5.6") + "ch.qos.logback" % "logback-classic" % "1.5.8") lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .withoutSuffixFor(JVMPlatform) @@ -87,7 +87,7 @@ lazy val coreTests = project name := "http4s-stir-tests", libraryDependencies ++= http4s ++ circe ++ Seq( "org.scalatest" %% "scalatest" % "3.2.19" % Test, - "org.specs2" %% "specs2-core" % "4.20.7" % Test)).dependsOn( + "org.specs2" %% "specs2-core" % "4.20.8" % Test)).dependsOn( testkit.jvm % "test", core.jvm % "test->test") @@ -100,7 +100,7 @@ lazy val testkit = crossProject(JSPlatform, JVMPlatform, NativePlatform) name := "http4s-stir-testkit", libraryDependencies ++= http4s ++ http4sClient ++ Seq( "org.scalatest" %% "scalatest" % "3.2.19" % "provided", - "org.specs2" %% "specs2-core" % "4.20.7" % "provided")).dependsOn(core) + "org.specs2" %% "specs2-core" % "4.20.8" % "provided")).dependsOn(core) lazy val examples = project .in(file("examples")) @@ -109,7 +109,7 @@ lazy val examples = project .settings( name := "http4s-stir-examples", libraryDependencies ++= http4s ++ circe ++ logback ++ Seq( - "org.specs2" %% "specs2-core" % "4.20.7" % Test, + "org.specs2" %% "specs2-core" % "4.20.8" % Test, "org.scalatest" %% "scalatest" % "3.2.19" % Test)) .dependsOn(core.jvm, testkit.jvm % Test) diff --git a/project/plugins.sbt b/project/plugins.sbt index a7d001a..bf2808a 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.16.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.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.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 +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.2") +addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.9")