From 51e7dc5b0435a19a1324f83e5e733daac77d01cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowa?= <contact@luksow.com>
Date: Mon, 14 Oct 2024 20:20:07 +0200
Subject: [PATCH] Deps update, ci update.

---
 .github/workflows/ci.yml | 15 ++++++---------
 build.sbt                |  6 +++---
 project/plugins.sbt      |  4 +---
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fee08e6..bcdf6da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,8 +40,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -98,11 +97,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master')
-        run: mkdir -p testkit/.native/target testkit/.js/target core/.native/target core/.js/target core/.jvm/target testkit/.jvm/target project/target
+        run: mkdir -p core/.native/target core/.js/target core/.jvm/target testkit/.jvm/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master')
-        run: tar cf targets.tar testkit/.native/target testkit/.js/target core/.native/target core/.js/target core/.jvm/target testkit/.jvm/target project/target
+        run: tar cf targets.tar core/.native/target core/.js/target core/.jvm/target testkit/.jvm/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master')
@@ -122,8 +121,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -242,7 +240,7 @@ jobs:
 
   dependency-submission:
     name: Submit Dependencies
-    if: github.event_name != 'pull_request'
+    if: github.event.repository.fork == false && github.event_name != 'pull_request'
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -250,8 +248,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
diff --git a/build.sbt b/build.sbt
index 7389b25..f54966a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -63,11 +63,11 @@ val http4sClient = Def.setting(
   "org.http4s" %%% "http4s-ember-client" % "0.23.28")
 
 val circeCore = Def.setting("io.circe" %%% "circe-core" % "0.14.8")
-val circeGeneric = Def.setting("io.circe" %%% "circe-generic" % "0.14.8")
-val circeParser = Def.setting("io.circe" %%% "circe-parser" % "0.14.8")
+val circeGeneric = Def.setting("io.circe" %%% "circe-generic" % "0.14.10")
+val circeParser = Def.setting("io.circe" %%% "circe-parser" % "0.14.10")
 val http4sCirce = Def.setting("org.http4s" %%% "http4s-circe" % "0.23.28")
 
-val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.2.18")
+val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.2.19")
 val specs2 = Def.setting("org.specs2" %%% "specs2-core" % "4.20.6")
 
 val scalaXml = Def.setting("org.scala-lang.modules" %%% "scala-xml" % "2.2.0")
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 84d5139..9bfccc1 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,11 +2,9 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
 
 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.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.2")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.4")
 addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.9")