From 8b10486fa6e48ff90517348427b1a4fd4ba28663 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 24 Jun 2023 03:32:22 -0400
Subject: [PATCH] sbt 1.9.0

---
 .github/workflows/ci.yml                       | 17 ++++++-----------
 .github/workflows/{release.yml => release.txt} | 15 ++++++---------
 build.sbt                                      |  2 +-
 project/build.properties                       |  2 +-
 project/plugins.sbt                            |  3 ++-
 5 files changed, 16 insertions(+), 23 deletions(-)
 rename .github/workflows/{release.yml => release.txt} (75%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a69685a6..9a8218b89 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,18 +14,13 @@ jobs:
       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@v10
+      uses: actions/checkout@v3
+    - name: Setup JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: "adopt@1.8"
-    - name: Coursier cache
-      uses: coursier/cache-action@v5
+        distribution: "temurin"
+        java-version: 8
+        cache: sbt
     - name: Build and test
       run: |
         sbt -v clean 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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.txt
similarity index 75%
rename from .github/workflows/release.yml
rename to .github/workflows/release.txt
index b63af65a3..30bad8521 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.txt
@@ -12,16 +12,13 @@ jobs:
       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@v10
+      uses: actions/checkout@v3
+    - name: Setup JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: "adopt@1.8"
-    - name: Coursier cache
-      uses: coursier/cache-action@v5
-    - name: Test
-      run: |
-        sbt test packagedArtifacts
+        distribution: "temurin"
+        java-version: 8
+        cache: sbt
     - name: Release
       env:
         SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
diff --git a/build.sbt b/build.sbt
index 5d5c3c428..6723b8625 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / organization := "com.eed3si9n"
-ThisBuild / dynverSonatypeSnapshots := true
+// ThisBuild / dynverSonatypeSnapshots := true
 ThisBuild / version := {
   val orig = (ThisBuild / version).value
   if (orig.endsWith("-SNAPSHOT")) "0.7.0-SNAPSHOT"
diff --git a/project/build.properties b/project/build.properties
index 10fd9eee0..40b3b8e7b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.9.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3927997eb..8cd765b36 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1,2 @@
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
+// addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")