Merge pull request #674 from ThoughtWorksInc/update/template

Update template
ThoughtWorksInc · Jul 1, 2023 · bae4b07 · bae4b07
2 parents 1fa338c + 3a2617d
commit bae4b07
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 20 deletions.
diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
@@ -0,0 +1,31 @@
+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
+      - 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
+          base: ${{github.ref_name}}
+          branch: update/${{github.ref_name}}/scala-project-template
+          title: Update scala-project-template
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
diff --git a/.gitpod.yml b/.gitpod.yml
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,3 +1,3 @@
 runner.dialect = "scala3"
-version = "3.7.1"
+version = "3.7.5"
 maxColumn = 80
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.9.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,15 +1,3 @@
-addSbtPlugin(
-  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"
-)
-
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.20")
-
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
-
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
-
-addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.2.1")
-
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")

diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt
@@ -0,0 +1,3 @@
+addSbtPlugin(
+  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"
+)
diff --git a/secret.sbt b/secret.sbt
@@ -6,7 +6,7 @@ lazy val secret = {
       org.eclipse.jgit.api.Git
         .cloneRepository()
         .setURI(
-          "https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git"
+          "https://github.com/Atry/secrets.git"
         )
         .setDirectory(secretDirectory)
         .setCredentialsProvider(