From 33d8726e9e21e2150539f5f5ee49bfd87e5ecb6e Mon Sep 17 00:00:00 2001
From: Roman Langolf <rolang@pm.me>
Date: Sun, 13 Oct 2024 18:40:55 +0700
Subject: [PATCH] update dependencies / fix ci

---
 .github/workflows/ci.yml | 17 +++++++----------
 .scalafix.conf           |  6 +-----
 build.sbt                | 10 +++++-----
 project/build.properties |  2 +-
 project/plugins.sbt      |  4 ++--
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 75174c7..0efa2ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,8 +44,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
@@ -80,7 +79,7 @@ jobs:
 
       - name: Start up Postgres
         if: startsWith(matrix.os, 'ubuntu')
-        run: docker-compose up -d
+        run: docker compose up -d
 
       - name: Install native dependencies (ubuntu)
         if: (matrix.project == 'rootNative') && startsWith(matrix.os, 'ubuntu')
@@ -189,8 +188,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
@@ -225,7 +223,7 @@ jobs:
 
       - name: Start up Postgres
         if: startsWith(matrix.os, 'ubuntu')
-        run: docker-compose up -d
+        run: docker compose up -d
 
       - name: Download target directories (3, rootJVM)
         uses: actions/download-artifact@v4
@@ -351,7 +349,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]
@@ -359,8 +357,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
@@ -395,7 +392,7 @@ jobs:
 
       - name: Start up Postgres
         if: startsWith(matrix.os, 'ubuntu')
-        run: docker-compose up -d
+        run: docker compose up -d
 
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
diff --git a/.scalafix.conf b/.scalafix.conf
index a243571..fee5375 100644
--- a/.scalafix.conf
+++ b/.scalafix.conf
@@ -7,7 +7,7 @@ rules = [
 ]
 
 OrganizeImports {
-  removeUnused = false
+  removeUnused = true
   targetDialect = Scala3
   expandRelative = true
   groupedImports = Merge
@@ -18,10 +18,6 @@ OrganizeImports {
   ]
 }
 
-RemoveUnused {
-  imports = false # handled by OrganizeImports
-}
-
 DisableSyntax.noThrows = true
 DisableSyntax.noNulls = false
 DisableSyntax.noReturns = true
diff --git a/build.sbt b/build.sbt
index 0b3e65b..e267034 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 import scala.scalanative.build.*
 
-lazy val `scala-2.13` = "2.13.14"
-lazy val `scala-3`    = "3.3.3"
+lazy val `scala-2.13` = "2.13.15"
+lazy val `scala-3`    = "3.3.4"
 
 ThisBuild / tlBaseVersion      := "0.4"
 ThisBuild / startYear          := Some(2023)
@@ -63,7 +63,7 @@ ThisBuild / githubWorkflowBuildPreamble ++= List(
 }
 ThisBuild / githubWorkflowJobSetup ++= Seq(
   WorkflowStep.Run(
-    commands = List("docker-compose up -d"),
+    commands = List("docker compose up -d"),
     name = Some("Start up Postgres"),
     cond = Some("startsWith(matrix.os, 'ubuntu')"),
   )
@@ -344,8 +344,8 @@ lazy val tests = crossProject(JVMPlatform, NativePlatform)
     },
   )
 
-lazy val flywayVersion     = "10.17.0"
-lazy val postgresqlVersion = "42.7.3"
+lazy val flywayVersion     = "10.19.0"
+lazy val postgresqlVersion = "42.7.4"
 lazy val testsFlyway = project
   .in(file("modules/tests-flyway"))
   .enablePlugins(AutomateHeaderPlugin, NoPublishPlugin)
diff --git a/project/build.properties b/project/build.properties
index ee4c672..0b699c3 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d90e0b0..c78409e 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,9 +4,9 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
 
-lazy val sbtTlVersion = "0.7.2"
+lazy val sbtTlVersion = "0.7.4"
 
 addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % sbtTlVersion)