Merge pull request #86 from gemelen/main

Infra versions bump

Author: gemelen

.github/workflows/ci.yml

@@ -15,22 +15,23 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [8, 21]
+        java: ['temurin:8', 'temurin:21']
     runs-on: ${{ matrix.os }}
     env:
       # define Java options for both official sbt and sbt-extras
-      JAVA_OPTS: -Dfile.encoding=UTF-8 
+      JAVA_OPTS: -Dfile.encoding=UTF-8
       JVM_OPTS:  -Dfile.encoding=UTF-8
       ADDITIONAL_JVM_OPTS: -Djava.security.manager=allow
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up JVM
-        uses: actions/setup-java@v4
+      - name: Setup cache
+        uses: coursier/cache-action@v6
+      - name: Setup jdk and sbt
+        uses: coursier/setup-action@v1
         with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-          cache: 'sbt'
+          jvm: ${{ matrix.java }}
+          apps: sbt
       - name: Test
         shell: bash
         run: sbt -v clean test scripted

.github/workflows/release.yml

@@ -16,12 +16,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JVM
-        uses: actions/setup-java@v4
+      - name: Setup cache
+        uses: coursier/cache-action@v6
+      - name: Setup jdk and sbt
+        uses: coursier/setup-action@v1
         with:
-          distribution: 'temurin'
-          java-version: '8'
-          cache: 'sbt'
+          jvm: 'temurin:8'
+          apps: sbt
       - name: Release
         run: sbt ci-release
         env:

.scalafmt.conf

@@ -1,7 +1,7 @@
 version = "3.8.0"
 maxColumn = 120
 project.git = true
-runner.dialect = scala212
+runner.dialect = scala212source3
 
 # http://docs.scala-lang.org/style/scaladoc.html recommends the JavaDoc style.
 # scala/scala is written that way too https://github.com/scala/scala/blob/v2.12.2/src/library/scala/Predef.scala

build.sbt

@@ -1,6 +1,6 @@
 val mvnVersion = "3.9.4"
 val mvnResolverVersion = "1.9.18"
-val scala212 = "2.12.19"
+val scala212 = "2.12.20"
 
 ThisBuild / organization := "com.github.sbt"
 ThisBuild / licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0"))

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.9

project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.1")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.2")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")