Merge pull request #191 from ThoughtWorksInc/70a9807

Merge 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

@@ -10,6 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         include:
         - scala: 3.2.1
@@ -18,18 +19,19 @@ jobs:
         - scala: 2.13.4
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0 # Need the git history for sbt-dynver to determine the version
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
-        distribution: 'adopt'
+        distribution: temurin
     - name: Cache SBT
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: | 
+          ~/.ivy2/local/
           ~/.ivy2/cache/
           ~/.sbt/
           ~/.coursier/
@@ -42,5 +44,5 @@ jobs:
     - name: Publish to Maven Central Repository
       env:
         GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}}
-      if: ${{env.GITHUB_PERSONAL_ACCESS_TOKEN != ''}}
+      if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' }}
       run: sbt ${{matrix.sbt-args}} ++${{matrix.scala}} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}} ${{github.run_number}} ${{github.run_attempt}} ${{matrix.scala}}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease

.gitignore

@@ -4,4 +4,6 @@ secret/
 .metals/
 .bloop/
 metals.sbt
-.bsp/sbt.json
+.bsp/
+.vscode/launch.json
+*.scala.semanticdb

.scalafmt.conf

@@ -1,3 +1,3 @@
-version = "3.6.1"
-maxColumn = 120
 runner.dialect = scala3
+version = "3.6.1"
+maxColumn = 80

project/plugins.sbt

@@ -1,4 +1,6 @@
-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.9.15")
 

secret.sbt

@@ -5,10 +5,15 @@ lazy val secret = {
       IO.delete(secretDirectory)
       org.eclipse.jgit.api.Git
         .cloneRepository()
-        .setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git")
+        .setURI(
+          "https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git"
+        )
         .setDirectory(secretDirectory)
         .setCredentialsProvider(
-          new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "")
+          new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(
+            token,
+            ""
+          )
         )
         .call()
         .close()