Merge branch 'template' of github.com:ThoughtWorksInc/scala-project-template into template

Author: Atry

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.1.2
+fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6

.github/workflows/scala-steward.yml

@@ -0,0 +1,19 @@
+on:
+  push:
+    branches-ignore:
+      - 'update/**'
+  schedule:
+    - cron: '0 0 * * 0'
+
+name: Launch Scala Steward
+
+jobs:
+  scala-steward:
+    runs-on: ubuntu-22.04
+    name: Launch Scala Steward
+    steps:
+      - name: Launch Scala Steward
+        uses: scala-steward-org/scala-steward-action@v2
+        with:
+          github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
+          branches: ${{ github.ref_name }}

.github/workflows/scala.yml

@@ -1,8 +1,10 @@
 name: Scala CI
 
 on:
-- push
-- pull_request
+  push:
+    branches-ignore:
+    - 'update/**'
+  pull_request:
 
 jobs:
   build:
@@ -39,6 +41,6 @@ jobs:
       run: sbt ++${{ matrix.scala }} test
     - name: Publish to Maven Central Repository
       env:
-        SECRET_GIST: ${{secrets.SECRET_GIST}}
-      if: ${{ env.SECRET_GIST != '' }}
+        GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}}
+      if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' && github.event_name != 'pull_request' }}
       run: sbt ++${{ matrix.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease

.scalafmt.conf

@@ -1,3 +1,3 @@
 runner.dialect = scala212source3
-version = "3.1.1"
+version = "3.6.1"
 maxColumn = 80

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.8.2

project/plugins.sbt

@@ -1,11 +1,13 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.4")
+addSbtPlugin(
+  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.4"
+)
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15")
 
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 
 addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
 
-addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0")
+addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.2.1")

secret.sbt

@@ -1,12 +1,20 @@
 lazy val secret = {
-  for (gist <- sys.env.get("SECRET_GIST")) yield {
+  for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) yield {
     val secret = project.settings(publish / skip := true).in {
       val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
       IO.delete(secretDirectory)
       org.eclipse.jgit.api.Git
         .cloneRepository()
-        .setURI(gist)
+        .setURI(
+          "https://github.com/Atry/secrets.git"
+        )
         .setDirectory(secretDirectory)
+        .setCredentialsProvider(
+          new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(
+            token,
+            ""
+          )
+        )
         .call()
         .close()
       secretDirectory