Merge pull request #53 from eed3si9n/wip/actions

ci: Update GitHub Actions

Author: eed3si9n

.github/workflows/ci.yml

@@ -2,29 +2,22 @@ name: CI
 on:
   pull_request:
   push:
-  schedule:
-  # 2am EST every Saturday
-  - cron: '0 7 * * 6'
 jobs:
   build_scala2_12:
     runs-on: ubuntu-latest
     env:
+      # define Java options for both official sbt and sbt-extras
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+      JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup Scala
-      uses: olafurpg/setup-scala@v13
+      uses: actions/checkout@v4
+    - name: Setup JDK
+      uses: actions/setup-java@v4
       with:
-        java-version: "[email protected]"
-    - name: Coursier cache
-      uses: coursier/cache-action@v6
+        distribution: "zulu"
+        java-version: 8
+        cache: sbt
+    - uses: sbt/setup-sbt@v1
     - name: Build and test
-      run: |
-        sbt -v clean +test +scripted
-        rm -rf "$HOME/.ivy2/local" || true
-        find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
-        find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
-        find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
-        find $HOME/.sbt                              -name "ivydata-*.properties" -delete || true
-      shell: bash
+      run: sbt -v clean +test +scripted

.github/workflows/release.yml

@@ -7,11 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@v13
+        uses: actions/checkout@v4
+      - name: Setup JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: "[email protected]"
+          distribution: "zulu"
+          java-version: 8
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: Release
         run: sbt ci-release
         env:

build.sbt

@@ -2,7 +2,7 @@ ThisBuild / version := {
   if ((ThisBuild / isSnapshot).value) "0.5.0" + "-SNAPSHOT"
   else (ThisBuild / version).value
 }
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.20"
 
 lazy val root = (project in file("."))
   .enablePlugins(SbtPlugin)
@@ -21,9 +21,16 @@ lazy val root = (project in file("."))
     scriptedLaunchOpts ++= Seq("-Xms512m", "-Xmx512m", s"-Dproject.version=${version.value}")
     // scriptedBufferLog := false
 
-    pluginCrossBuild / sbtVersion := {
+    (pluginCrossBuild / sbtVersion) := {
       scalaBinaryVersion.value match {
-        case "2.12" => "1.1.6" // minimum sbt version
+        case "2.12" => "1.2.8"
+        case _      => "2.0.0-M3"
+      }
+    }
+    scriptedSbt := {
+      scalaBinaryVersion.value match {
+        case "2.12" => "1.10.7"
+        case _      => "2.0.0-M3"
       }
     }
   })

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.10.7

project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
-addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.0")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
+addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.2")

src/sbt-test/proguard/scala3/test.sbt

@@ -1,5 +1,5 @@
 import java.nio.file.{Files, FileSystems}
-import scala.jdk.CollectionConverters.*
+import collection.JavaConverters._
 import scala.sys.process.Process
 
 // for sbt scripted test: