From 5a8b5e4e91c793fc8ab407f87e34cc7eb9656294 Mon Sep 17 00:00:00 2001 From: Jozef Koval Date: Mon, 17 Mar 2025 16:25:51 +0100 Subject: [PATCH 1/2] Update sbt, scala and plugins. --- .github/workflows/ci.yml | 2 +- build.sbt | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06fa92c2..7c64ae15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8, 2.12.10, 2.11.12] + scala: [2.13.16, 2.12.20, 2.11.12] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 9805c008..c726524c 100644 --- a/build.sbt +++ b/build.sbt @@ -8,8 +8,8 @@ lazy val sonatypePublic = "Sonatype Public" at "https://oss.sonatype.org/content lazy val sonatypeReleases = "Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/" lazy val sonatypeSnapshots = "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" -lazy val scala213 = "2.13.8" -lazy val scala212 = "2.12.10" +lazy val scala213 = "2.13.16" +lazy val scala212 = "2.12.20" lazy val scala211 = "2.11.12" //javacOptions ++= diff --git a/project/build.properties b/project/build.properties index c06db1bb..73df629a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.5 +sbt.version=1.10.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index f6b5cd59..8bf183cd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,10 @@ logLevel := Level.Warn -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0") -addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") +addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") +addDependencyTreePlugin +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") From 80b34e2c7f178574bd9fde4cb93e7a8799c06a89 Mon Sep 17 00:00:00 2001 From: Jozef Koval Date: Mon, 17 Mar 2025 17:35:06 +0100 Subject: [PATCH 2/2] Update github actions. --- .github/workflows/ci.yml | 6 +++--- .github/workflows/fatjar.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c64ae15..a38f307a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -36,7 +36,7 @@ jobs: java-version: ${{ matrix.java }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.sbt @@ -45,7 +45,7 @@ jobs: ~/.cache/coursier/v1 ~/AppData/Local/Coursier/Cache/v1 ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + key: ${{ runner.os }}-sbt-cache-v4-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Runs tests and collect coverage run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} "project appkit" test; sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} "project common" test; sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} "project libImpl" test diff --git a/.github/workflows/fatjar.yml b/.github/workflows/fatjar.yml index 7204ddbc..5a0bb2e9 100644 --- a/.github/workflows/fatjar.yml +++ b/.github/workflows/fatjar.yml @@ -10,7 +10,7 @@ jobs: name: Build fat jar runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Java and Scala uses: olafurpg/setup-scala@v10 @@ -18,7 +18,7 @@ jobs: java-version: adopt@1.8 - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.sbt @@ -27,7 +27,7 @@ jobs: ~/.cache/coursier/v1 ~/AppData/Local/Coursier/Cache/v1 ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + key: ${{ runner.os }}-sbt-cache-v4-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Import GPG key run: ci/import_gpg.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a395130..a00635d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: name: Publish release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Java and Scala uses: olafurpg/setup-scala@v10 @@ -20,7 +20,7 @@ jobs: java-version: adopt@1.8 - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.sbt @@ -29,7 +29,7 @@ jobs: ~/.cache/coursier/v1 ~/AppData/Local/Coursier/Cache/v1 ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + key: ${{ runner.os }}-sbt-cache-v4-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Import GPG key run: ci/import_gpg.sh