From 278346609c1e2dd15406b093c356eebb2b03fd2e Mon Sep 17 00:00:00 2001
From: Johnnei <jtiesinga@gmail.com>
Date: Tue, 30 Jul 2024 21:19:55 +0700
Subject: [PATCH 1/4] Move away from deprecated actions

---
 .github/workflows/release.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e54dc5f..5bf3a3c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,19 +1,19 @@
 name: Release
 on:
   push:
-    branches: [master]
+    branches: [master, update-release-flow]
     tags: ["*"]
 jobs:
   release:
     runs-on: ubuntu-latest
     if: github.repository == 'scapegoat-scala/sbt-scapegoat'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - run: git fetch --prune --unshallow
+      - uses: actions/setup-java@v4
         with:
-          fetch-depth: 0
-      - uses: olafurpg/setup-scala@v14
-        with:
-          java-version: adopt@1.8
+          distribution: adopt
+          java-version: 8
       - run: |
           echo ${PGP_SECRET:0:4}...${PGP_SECRET: -4}
           sbt ci-release

From 08fa368476a9b95c7656636a2908da44bb17b5ee Mon Sep 17 00:00:00 2001
From: Johnnei <jtiesinga@gmail.com>
Date: Tue, 30 Jul 2024 21:26:12 +0700
Subject: [PATCH 2/4] does whitespace matter?

---
 .github/workflows/pr-checks.yml | 11 ++++++-----
 .github/workflows/release.yml   |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index f710bc0..6973bdd 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -13,16 +13,17 @@ jobs:
           - 1.10.1
           - 0.13.18
     steps:
-      - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.${{matrix.java}}
-      - uses: actions/cache@v3
+          distribution: adopt
+          java-version: 8
+      - uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache
           key: ivy-${{hashFiles('**/*.sbt')}}-${{matrix.sbt}}
           restore-keys: ivy-
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.sbt
           key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}}-${{matrix.sbt}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5bf3a3c..ac9db5d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,5 +20,5 @@ jobs:
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
+          SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}

From 0886c65e4c634f47aea48bb33183f9a2ed601235 Mon Sep 17 00:00:00 2001
From: Johnnei <jtiesinga@gmail.com>
Date: Tue, 30 Jul 2024 21:29:10 +0700
Subject: [PATCH 3/4] Did it migrate to the new host?

---
 build.sbt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index 20d6510..588d55d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -37,7 +37,3 @@ crossSbtVersions := Seq("0.13.18", "1.5.8")
 
 Test / publishArtifact := false
 Test / parallelExecution := false
-
-sonatypeCredentialHost := "s01.oss.sonatype.org"
-sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
-

From fc0e523e506adc7654ff089dc673fbf10dda9961 Mon Sep 17 00:00:00 2001
From: Johnnei <jtiesinga@gmail.com>
Date: Tue, 30 Jul 2024 21:31:40 +0700
Subject: [PATCH 4/4] undo testing changes and clean up

---
 .github/workflows/release.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac9db5d..bca7949 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,7 @@
 name: Release
 on:
   push:
-    branches: [master, update-release-flow]
+    branches: [master]
     tags: ["*"]
 jobs:
   release:
@@ -14,11 +14,9 @@ jobs:
         with:
           distribution: adopt
           java-version: 8
-      - run: |
-          echo ${PGP_SECRET:0:4}...${PGP_SECRET: -4}
-          sbt ci-release
+      - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
-          SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
-          SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}