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.

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

update dependencies / fix ci #85

Merged
merged 1 commit into from
Oct 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -351,16 +349,15 @@ 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]
java: [temurin@21]
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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions .scalafix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rules = [
]

OrganizeImports {
removeUnused = false
removeUnused = true
targetDialect = Scala3
expandRelative = true
groupedImports = Merge
Expand All @@ -18,10 +18,6 @@ OrganizeImports {
]
}

RemoveUnused {
imports = false # handled by OrganizeImports
}

DisableSyntax.noThrows = true
DisableSyntax.noNulls = false
DisableSyntax.noReturns = true
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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')"),
)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.10.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading