From 5aba73d257e3c9ce740a0f8e682b6a9b8dbb7de8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 29 Jan 2023 21:36:33 -0800
Subject: [PATCH 01/21] Update sbt-sonatype to 3.9.17 in template (#39)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 31256db..183c101 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin(
   "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5"
 )
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.16")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17")
 
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 

From fc08ba242762e936c848a7bbc17fbdc15c1c68f4 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Tue, 14 Feb 2023 07:35:11 -0800
Subject: [PATCH 02/21] Update and rename plugins.sbt to sbt-best-practice.sbt

---
 project/plugins.sbt           | 13 -------------
 project/sbt-best-practice.sbt |  3 +++
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 project/plugins.sbt
 create mode 100644 project/sbt-best-practice.sbt

diff --git a/project/plugins.sbt b/project/plugins.sbt
deleted file mode 100644
index 183c101..0000000
--- a/project/plugins.sbt
+++ /dev/null
@@ -1,13 +0,0 @@
-addSbtPlugin(
-  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5"
-)
-
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17")
-
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
-
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
-
-addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
-
-addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.2.1")
diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt
new file mode 100644
index 0000000..1340249
--- /dev/null
+++ b/project/sbt-best-practice.sbt
@@ -0,0 +1,3 @@
+addSbtPlugin(
+  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"
+)

From 0ff30d8ef4d03bb3ae8fa6f38e25413da14c188d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 14:34:28 -0700
Subject: [PATCH 03/21] Update scalafmt-core to 3.7.1 in template (#16)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

From 421e1741b53e117878cc63aae3d68a8af9bed8a0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 14:37:04 -0700
Subject: [PATCH 04/21] Update scalafmt-core to 3.7.5 in template (#22)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .scalafmt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index d4dfbab..e26dcdb 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,3 +1,3 @@
 runner.dialect = scala212source3
-version = "3.7.1"
+version = "3.7.5"
 maxColumn = 80

From 4614ec7e371325f4e4560d56e47a4e5805c4f3a0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 14:37:24 -0700
Subject: [PATCH 05/21] Update sbt to 1.8.3 in template (#21)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 46e43a9..72413de 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.8.3

From 08fb7550a580d79a6276db251d6974399adf09b6 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <yang-bo@yang-bo.com>
Date: Sat, 1 Jul 2023 14:55:34 -0700
Subject: [PATCH 06/21] Add GitHub Action to pull scala-project-template

---
 .github/workflows/scala-project-template.yml | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/scala-project-template.yml

diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
new file mode 100644
index 0000000..2323a1f
--- /dev/null
+++ b/.github/workflows/scala-project-template.yml
@@ -0,0 +1,30 @@
+on:
+  push:
+    branches-ignore:
+      - "update/**"
+  schedule:
+    - cron: "0 0 * * 0"
+  workflow_dispatch:
+
+name: Update Scala project template
+
+jobs:
+  update-scala-project-template:
+    permissions:
+      # for aws-actions/configure-aws-credentials to assume an AWS role
+      id-token: write
+      # for peter-evans/create-pull-request to create branch
+      contents: write
+      # for peter-evans/create-pull-request to create a PR
+      pull-requests: write
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: template
+          repository: Atry/scala-project-template
+      - uses: peter-evans/create-pull-request@v5
+        with:
+          branch: update/${{github.ref_name}}/scala-project-template
+          title: Update scala-project-template
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}

From fa385236069f4558252e041404758bd73fa12cda Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 14:56:59 -0700
Subject: [PATCH 07/21] Update sbt to 1.9.1 in template (#24)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 72413de..3c0b78a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.1

From 744999edf7dc464ab58ac5a4c2947b8092db9053 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sat, 1 Jul 2023 15:17:44 -0700
Subject: [PATCH 08/21] Update scala-project-template.yml

---
 .github/workflows/scala-project-template.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
index 2323a1f..e72da06 100644
--- a/.github/workflows/scala-project-template.yml
+++ b/.github/workflows/scala-project-template.yml
@@ -23,8 +23,11 @@ jobs:
         with:
           ref: template
           repository: Atry/scala-project-template
+      - run: git config remote.origin.url "${{github.repositoryUrl}}"
       - uses: peter-evans/create-pull-request@v5
         with:
+          delete-branch: true
+          base: ${{github.ref_name}}
           branch: update/${{github.ref_name}}/scala-project-template
           title: Update scala-project-template
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}

From 418b18df2a7e19c7e6a33a6522be830eb6636446 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sat, 1 Jul 2023 15:21:20 -0700
Subject: [PATCH 09/21] Update scala-project-template.yml

---
 .github/workflows/scala-project-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
index e72da06..0eef2e5 100644
--- a/.github/workflows/scala-project-template.yml
+++ b/.github/workflows/scala-project-template.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           ref: template
           repository: Atry/scala-project-template
-      - run: git config remote.origin.url "${{github.repositoryUrl}}"
+      - run: git config remote.origin.url "https://github.com/${{github.repository}}"
       - uses: peter-evans/create-pull-request@v5
         with:
           delete-branch: true

From c31f513245b4810429f59453907c96ee22f69fea Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sat, 1 Jul 2023 15:28:13 -0700
Subject: [PATCH 10/21] Update scala-project-template.yml

---
 .github/workflows/scala-project-template.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
index 0eef2e5..90ec861 100644
--- a/.github/workflows/scala-project-template.yml
+++ b/.github/workflows/scala-project-template.yml
@@ -24,6 +24,7 @@ jobs:
           ref: template
           repository: Atry/scala-project-template
       - run: git config remote.origin.url "https://github.com/${{github.repository}}"
+      - run: git switch -c ${{github.ref_name}}
       - uses: peter-evans/create-pull-request@v5
         with:
           delete-branch: true

From 885406c5ac56b058fa717cf18e7529fe746a8213 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sat, 1 Jul 2023 15:31:21 -0700
Subject: [PATCH 11/21] Delete .gitpod.yml

---
 .gitpod.yml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .gitpod.yml

diff --git a/.gitpod.yml b/.gitpod.yml
deleted file mode 100644
index cd17bda..0000000
--- a/.gitpod.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-image: igeolise/scalajs-test-runner:latest
-vscode:
-  extensions:
-    - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA==
-    - scalameta.metals@1.9.0:EyAIfy0ykjUn9htpw3f7GA==
\ No newline at end of file

From a335404c2376171c51fadd9eb20ccf71e3a7f684 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sat, 1 Jul 2023 15:35:56 -0700
Subject: [PATCH 12/21] Update scala-project-template.yml

---
 .github/workflows/scala-project-template.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
index 90ec861..982e639 100644
--- a/.github/workflows/scala-project-template.yml
+++ b/.github/workflows/scala-project-template.yml
@@ -20,11 +20,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-        with:
-          ref: template
-          repository: Atry/scala-project-template
-      - run: git config remote.origin.url "https://github.com/${{github.repository}}"
-      - run: git switch -c ${{github.ref_name}}
+      - run: git fetch https://github.com/Atry/scala-project-template.git template
+      - run: git reset --hard FETCH_HEAD
       - uses: peter-evans/create-pull-request@v5
         with:
           delete-branch: true

From d6d207cdff1e240f8f50eaabcd748b7011fd248d Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sun, 2 Jul 2023 00:38:07 -0700
Subject: [PATCH 13/21] Update scala-project-template.yml

---
 .github/workflows/scala-project-template.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
index 982e639..84df238 100644
--- a/.github/workflows/scala-project-template.yml
+++ b/.github/workflows/scala-project-template.yml
@@ -23,6 +23,7 @@ jobs:
       - run: git fetch https://github.com/Atry/scala-project-template.git template
       - run: git reset --hard FETCH_HEAD
       - uses: peter-evans/create-pull-request@v5
+        continue-on-error: true
         with:
           delete-branch: true
           base: ${{github.ref_name}}

From 503bd682bea73a577ebac344d70a29f9f90bfe4d Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sun, 2 Jul 2023 00:45:24 -0700
Subject: [PATCH 14/21] Update scala-project-template.yml

---
 .github/workflows/scala-project-template.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
index 84df238..370eefe 100644
--- a/.github/workflows/scala-project-template.yml
+++ b/.github/workflows/scala-project-template.yml
@@ -11,8 +11,6 @@ name: Update Scala project template
 jobs:
   update-scala-project-template:
     permissions:
-      # for aws-actions/configure-aws-credentials to assume an AWS role
-      id-token: write
       # for peter-evans/create-pull-request to create branch
       contents: write
       # for peter-evans/create-pull-request to create a PR

From a147645655ebbb583d7f9bfd0e299aa6ac679aea Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sat, 28 Dec 2024 15:26:34 -0800
Subject: [PATCH 15/21] Add sbt/setup-sbt GitHub Actions

See https://github.com/sbt/setup-sbt/blob/75854e74d1300e4a4ec393739ca8633856901359/README.md#december-2024
---
 .github/workflows/scala.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 4f71e11..2191911 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -27,6 +27,7 @@ jobs:
         with:
           java-version: "11"
           distribution: temurin
+      - uses: sbt/setup-sbt@v1
       - name: Cache SBT
         uses: actions/cache@v3
         with:

From 4af80a5aad2cf1422979a3a19aed72debab74864 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Sat, 28 Dec 2024 15:52:14 -0800
Subject: [PATCH 16/21] Upgrade default Scala version to 2.12.20

---
 .github/workflows/scala.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 2191911..b90397e 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         scala:
-          - 2.12.15
+          - 2.12.20
 
     steps:
       - uses: actions/checkout@v3

From 6edea8306ce10d81352e843f20230b7281115883 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 28 Dec 2024 15:52:51 -0800
Subject: [PATCH 17/21] Update scalafmt-core to 3.7.17 in template (#27)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .scalafmt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index e26dcdb..aa5ff8c 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,3 +1,3 @@
 runner.dialect = scala212source3
-version = "3.7.5"
+version = "3.7.17"
 maxColumn = 80

From 3717822906890ca2cfdefef092e30147df698246 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 28 Dec 2024 15:53:06 -0800
Subject: [PATCH 18/21] Update sbt-best-practice to 8.3.1 in template (#25)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 project/sbt-best-practice.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt
index 1340249..ff7f572 100644
--- a/project/sbt-best-practice.sbt
+++ b/project/sbt-best-practice.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin(
-  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"
+  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.1"
 )

From 47ecb1ee1d6cab207b4b1998366a1189b05282e6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 28 Dec 2024 15:53:13 -0800
Subject: [PATCH 19/21] Update sbt, scripted-plugin to 1.9.9 in template (#26)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 3c0b78a..04267b1 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.9

From 0745c0cc2498a354a562a6fbfb389ddb0e5b766c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 29 Dec 2024 19:58:51 -0800
Subject: [PATCH 20/21] Update scalafmt-core to 3.8.3 in template (#29)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .scalafmt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index aa5ff8c..6258938 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,3 +1,3 @@
 runner.dialect = scala212source3
-version = "3.7.17"
+version = "3.8.3"
 maxColumn = 80

From 6a6c858fff90d77e6416276e6a7f5d21695117c1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 29 Dec 2024 19:59:06 -0800
Subject: [PATCH 21/21] Update sbt, scripted-plugin to 1.10.7 in template (#28)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 04267b1..73df629 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.7