From 996ce99ef720cc4c0af09e8d1f743bbff9de626c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 5 Jun 2019 09:20:40 -0700 Subject: [PATCH 01/55] Use SECRET_GIST instead of GITHUB_PERSONAL_ACCESS_TOKEN --- secret.sbt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/secret.sbt b/secret.sbt index 3279570..4c61823 100644 --- a/secret.sbt +++ b/secret.sbt @@ -1,15 +1,12 @@ lazy val secret = { - for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) yield { + for (gist <- sys.env.get("SECRET_GIST")) yield { val secret = project.settings(publishArtifact := false).in { val secretDirectory = file(sourcecode.File()).getParentFile / "secret" IO.delete(secretDirectory) org.eclipse.jgit.api.Git .cloneRepository() - .setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git") + .setURI(gist) .setDirectory(secretDirectory) - .setCredentialsProvider( - new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "") - ) .call() .close() secretDirectory From d95f4b8a44cd442ee2bff8cf41d4f615ac5b5b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 5 Jun 2019 13:23:51 -0700 Subject: [PATCH 02/55] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efed74b..18e2a7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,4 +33,4 @@ deploy: skip_cleanup: true on: all_branches: true - condition: $GITHUB_PERSONAL_ACCESS_TOKEN + condition: $SECRET_GIST From 3b875bff5977a95269326d92cdee7c5a8c147e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Mon, 10 Jun 2019 20:06:16 -0700 Subject: [PATCH 03/55] Update plugins.sbt --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 19a0e09..d0a869e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+50-a3bcec16") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From 9c3a0d3ac11073f985df40c37a2bcd567f3a4561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 20 Jun 2019 15:28:18 -0700 Subject: [PATCH 04/55] Upgrade sbt-dynver --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 381c38b..cbb65b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.0 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") From fa2d834842d7c155231e8c4de3e6cf1ccf70dcff Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 5 Sep 2019 12:27:21 -0700 Subject: [PATCH 05/55] Upgrade sbt --- project/build.properties | 2 +- project/coursier.sbt | 1 - project/project/plugins.sbt | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 project/coursier.sbt delete mode 100644 project/project/plugins.sbt diff --git a/project/build.properties b/project/build.properties index c0bab04..dfa772b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.0 \ No newline at end of file diff --git a/project/coursier.sbt b/project/coursier.sbt deleted file mode 100644 index 3a2d48e..0000000 --- a/project/coursier.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtCoursier diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt deleted file mode 100644 index bb02ff0..0000000 --- a/project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3") From 75bfab06e9254d5e414484c68e6d6afe1de06efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 5 Sep 2019 16:04:39 -0700 Subject: [PATCH 06/55] Use publish / skip --- secret.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secret.sbt b/secret.sbt index 4c61823..f3db5e8 100644 --- a/secret.sbt +++ b/secret.sbt @@ -1,6 +1,6 @@ lazy val secret = { for (gist <- sys.env.get("SECRET_GIST")) yield { - val secret = project.settings(publishArtifact := false).in { + val secret = project.settings(publish / skip := true).in { val secretDirectory = file(sourcecode.File()).getParentFile / "secret" IO.delete(secretDirectory) org.eclipse.jgit.api.Git From 880b43f10a4214e4ae234a8c3c3b1f679509c6e1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2019 14:28:56 +0200 Subject: [PATCH 07/55] Update sbt-sonatype to 3.6 --- .travis.yml | 2 +- project/plugins.sbt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18e2a7c..c6e0a43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_deploy: deploy: - provider: script - script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease + script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease skip_cleanup: true on: all_branches: true diff --git a/project/plugins.sbt b/project/plugins.sbt index 1fdca4b..b8ff82f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,8 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") +libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.9" + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") From 073623cec5ac0e813c191398127ffef36fa83d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 3 Oct 2019 22:17:57 -0700 Subject: [PATCH 08/55] Upgrade sbt-sonatype --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bb891c9..4842aae 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.7") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") From 94df7163c9aa62df6a80e23471970a77b91c0dc2 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 4 Oct 2019 09:10:59 -0700 Subject: [PATCH 09/55] Update build.properties --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dfa772b..8522443 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.0 \ No newline at end of file +sbt.version=1.3.2 From 74ed2d73e404ac3c58bf791b1663e1b601e82525 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 27 Dec 2021 11:00:01 -0800 Subject: [PATCH 10/55] Update Scala to 2.12.15 --- .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 7796ccc..06ead64 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: scala: - - 2.12.8 + - 2.12.15 steps: - uses: actions/checkout@v2 From e28acdbcf9e59a9c6c15dd1282466de9c8bf0837 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 5 Feb 2022 21:40:29 -0800 Subject: [PATCH 11/55] Ignore *.scala.semanticdb --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 51b7c9d..1b71645 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ secret/ metals.sbt .bsp/sbt.json .vscode/launch.json +*.scala.semanticdb From 10022752c23977a79aa6af779ac458907f19b4fc Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 17 Mar 2022 01:53:31 -0700 Subject: [PATCH 12/55] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1b71645..5701ab5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ secret/ .metals/ .bloop/ metals.sbt -.bsp/sbt.json +.bsp/ .vscode/launch.json *.scala.semanticdb From 5ece74ca49806732b22ebad38a2e90b95f033288 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 19 Mar 2022 10:27:59 -0700 Subject: [PATCH 13/55] Use Temurin JDK --- .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 06ead64..78a21b0 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adopt' + distribution: temurin - name: Cache SBT uses: actions/cache@v2 with: From d93376af0a8c6777d9fd30e14cd2866ddbe553dd Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 08:37:12 -0800 Subject: [PATCH 14/55] Update sbt to 1.7.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 10fd9ee..6a9f038 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.7.3 From e4b2a1a38e1156f427b30f008a83a494bab2e897 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 09:18:20 -0800 Subject: [PATCH 15/55] Update sbt-best-practice to 8.2.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 38bc3b0..9c29eba 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.1") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.4") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") From 0bb0dcd6d1f778eb3def989bcec3edd0a46cffa7 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 12:02:40 -0800 Subject: [PATCH 16/55] Set default Scalafmt dialect to scala212source3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 26467aa..da2a9c4 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -runner.dialect = "scala213" +runner.dialect = scala212source3 version = "3.1.1" maxColumn = 80 From 9a891e1d2ec043c7f919a3be3949d7c57cd0b3f3 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 13:09:00 -0800 Subject: [PATCH 17/55] Update GitHub Action versions --- .github/workflows/scala.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 78a21b0..72126ac 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -16,16 +16,16 @@ jobs: - 2.12.15 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: temurin - name: Cache SBT - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/local/ From 0647cdd08064ac4774e9c42ad59835f3d36d7418 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 19:07:42 -0800 Subject: [PATCH 18/55] Create scala-steward.yml --- .github/workflows/scala-steward.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/scala-steward.yml diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml new file mode 100644 index 0000000..ae32d8a --- /dev/null +++ b/.github/workflows/scala-steward.yml @@ -0,0 +1,18 @@ +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 }} From e27f68442365088b5561a8f5daf9493879e3ead6 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 19:15:52 -0800 Subject: [PATCH 19/55] Let scala-steward update the current branch --- .github/workflows/scala-steward.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml index ae32d8a..b18a27b 100644 --- a/.github/workflows/scala-steward.yml +++ b/.github/workflows/scala-steward.yml @@ -16,3 +16,4 @@ jobs: uses: scala-steward-org/scala-steward-action@v2 with: github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} + branches: ${{ github.ref_name }} From cb5b02be552f35f6a6a450f1e67ff7a97a3910d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 03:18:20 +0000 Subject: [PATCH 20/55] Update scalafmt-core to 3.1.2 in template --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index da2a9c4..2ae5414 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = scala212source3 -version = "3.1.1" +version = "3.1.2" maxColumn = 80 From fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 03:18:24 +0000 Subject: [PATCH 21/55] Reformat with scalafmt 3.1.2 Executed command: scalafmt --non-interactive --- project/plugins.sbt | 4 +++- secret.sbt | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9c29eba..53533ff 100644 --- a/project/plugins.sbt +++ b/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.8") diff --git a/secret.sbt b/secret.sbt index bb264c7..3014621 100644 --- a/secret.sbt +++ b/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() From 32568fbcf182a381e4f6622ebdd88f6562e5877b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 03:18:24 +0000 Subject: [PATCH 22/55] Add 'Reformat with scalafmt 3.1.2' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..a94ba1f --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.1.2 +fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6 From a76dee316f02618250feea5a77739d368fc44a81 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 19:22:42 -0800 Subject: [PATCH 23/55] Update scalafmt-core to 3.6.1 in template (#30) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 2ae5414..094ff9b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = scala212source3 -version = "3.1.2" +version = "3.6.1" maxColumn = 80 From 94992e0adbc67f6538b337b8f35431a0a1146588 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 19:24:31 -0800 Subject: [PATCH 24/55] Update sbt-sonatype to 3.9.15 in template (#29) 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 53533ff..19fced3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ 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") From 01e962fab039c662b80e8e10344ad9b45c768019 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 19:24:36 -0800 Subject: [PATCH 25/55] Update sbt to 1.8.2 in template (#27) 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 6a9f038..46e43a9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.3 +sbt.version=1.8.2 From b1c6eed1f77d83ea0449e6e81ea82ea673de4371 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 19:24:40 -0800 Subject: [PATCH 26/55] Update sbt-example to 7.0.1 in template (#26) 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 19fced3..3ecf26e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") -addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0") +addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.1") From ac530269c9b3af2f3ef25c4dfd5145e5a21fefe6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 19:24:45 -0800 Subject: [PATCH 27/55] Update sbt-pgp to 1.1.2-1 in template (#25) 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 3ecf26e..3e7d806 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") From 75fd5eee5aedc31427d4df2ff6cfcaceb8c3fa7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 19:24:48 -0800 Subject: [PATCH 28/55] Update sbt-dynver to 4.1.1 in template (#24) 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 3e7d806..b797e5c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin( 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-1") From 5240d429f99743bde597ba5b70defad499fdaa15 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 19:32:58 -0800 Subject: [PATCH 29/55] Update sbt-example to 9.2.1 in template (#32) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b797e5c..7ca6887 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") -addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.1") +addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.2.1") From ec457efaaed11636eb94785112b1152901a29d0a Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 19:33:25 -0800 Subject: [PATCH 30/55] Update sbt-pgp to 2.1.1 in template (#31) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7ca6887..987080b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") From 78469342a5052ef7617a48b80b99ceed649b88eb Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 19:35:20 -0800 Subject: [PATCH 31/55] Update sbt-pgp to 2.1.2 in template (#33) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 987080b..1ef8873 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") From b531301aa2f684e8715694009c4cd16d2157d920 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 21:37:11 -0800 Subject: [PATCH 32/55] Update sbt-pgp to 2.2.1 in template (#34) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1ef8873..96ffca3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") From 8bd4b572a662636e32ad07483a06c63eb9e05c09 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 9 Jan 2023 21:51:30 -0800 Subject: [PATCH 33/55] Update scala-steward.yml --- .github/workflows/scala-steward.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml index b18a27b..449cd0e 100644 --- a/.github/workflows/scala-steward.yml +++ b/.github/workflows/scala-steward.yml @@ -1,7 +1,7 @@ on: push: branches-ignore: - - update/** + - 'update/**' schedule: - cron: '0 0 * * 0' From 2d4d89930c600aa12f3070b3222f3d39a7e5787b Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 10 Jan 2023 00:26:54 -0800 Subject: [PATCH 34/55] Update scala.yml --- .github/workflows/scala.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 72126ac..7cfd92c 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -1,8 +1,10 @@ name: Scala CI on: -- push -- pull_request + push: + branches-ignore: + - 'update/**' + pull_request: jobs: build: From b78f28da525f4b25b2bd2a3b4eb19bf5f6855037 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 10 Jan 2023 00:29:44 -0800 Subject: [PATCH 35/55] Update scala.yml --- .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 7cfd92c..bd9b0f8 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -42,5 +42,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 != '' && 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 From 5b86d1263a3804644aad0a47773c400f20695671 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 26 Jan 2023 14:10:36 -0800 Subject: [PATCH 36/55] ci(scala-steward): Allow for workflow_dispatch event --- .github/workflows/scala-steward.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml index 449cd0e..f04f703 100644 --- a/.github/workflows/scala-steward.yml +++ b/.github/workflows/scala-steward.yml @@ -4,6 +4,7 @@ on: - 'update/**' schedule: - cron: '0 0 * * 0' + workflow_dispatch: name: Launch Scala Steward From f217fc94329ec64602c9024dbf5df94ee673e9f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:14:39 -0800 Subject: [PATCH 37/55] Update sbt-best-practice to 8.2.5 in template (#35) 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 96ffca3..13f6c8a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin( - "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.4" + "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5" ) addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") From 14fb06342cd5c000ee1210167561793b4dc49513 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:14:47 -0800 Subject: [PATCH 38/55] Update scalafmt-core to 3.7.1 in template (#36) 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 094ff9b..d4dfbab 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = scala212source3 -version = "3.6.1" +version = "3.7.1" maxColumn = 80 From d80d76a87c24a7fe23c2ec95979861648ac1b758 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 26 Jan 2023 17:11:55 -0800 Subject: [PATCH 39/55] scala.yml should be triggered when pushing a release tag --- .github/workflows/scala.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index bd9b0f8..6b004dd 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -4,6 +4,9 @@ on: push: branches-ignore: - 'update/**' + tags: + - 'v*' + pull_request: jobs: From 43ef7e9862fec1d811a1d3337ebbfab2edb09ad0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 18:13:59 -0800 Subject: [PATCH 40/55] Update sbt-sonatype to 3.9.16 in template (#37) 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 13f6c8a..31256db 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.15") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.16") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") From 2525e590509f2129b101270d21df43c8ac613c9e Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 26 Jan 2023 18:25:36 -0800 Subject: [PATCH 41/55] Pass ${{matrix.sbt-args}} to sbt commands --- .github/workflows/scala.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 6b004dd..eb2e4db 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -6,7 +6,6 @@ on: - 'update/**' tags: - 'v*' - pull_request: jobs: @@ -41,9 +40,9 @@ jobs: ${{ runner.os }}-${{matrix.scala}}-${{ hashFiles('**/*.sbt') }} ${{ runner.os }}-${{matrix.scala}}- - name: Run tests - run: sbt ++${{ matrix.scala }} test + run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} test - name: Publish to Maven Central Repository env: 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 + 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 From a2bcfde87784e8fd83fb12ee03e024650f5bb114 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 26 Jan 2023 18:28:31 -0800 Subject: [PATCH 42/55] Add matrix.sbt-args to sbt cache keys --- .github/workflows/scala.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index eb2e4db..5046045 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -37,8 +37,9 @@ jobs: ~/.sbt/ ~/.coursier/ key: | - ${{ runner.os }}-${{matrix.scala}}-${{ hashFiles('**/*.sbt') }} - ${{ runner.os }}-${{matrix.scala}}- + ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-${{matrix.sbt-args}} + ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}- + ${{runner.os}}-${{matrix.scala}}- - name: Run tests run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} test - name: Publish to Maven Central Repository From a5f7afaf9f9732658ed22a19060d8de9c43a5d99 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 26 Jan 2023 18:30:20 -0800 Subject: [PATCH 43/55] Format YAML files --- .github/workflows/scala-steward.yml | 4 +- .github/workflows/scala.yml | 61 ++++++++++++++--------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml index f04f703..5350439 100644 --- a/.github/workflows/scala-steward.yml +++ b/.github/workflows/scala-steward.yml @@ -1,9 +1,9 @@ on: push: branches-ignore: - - 'update/**' + - "update/**" schedule: - - cron: '0 0 * * 0' + - cron: "0 0 * * 0" workflow_dispatch: name: Launch Scala Steward diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 5046045..4f71e11 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -3,47 +3,46 @@ name: Scala CI on: push: branches-ignore: - - 'update/**' + - "update/**" tags: - - 'v*' + - "v*" pull_request: jobs: build: - runs-on: ubuntu-latest strategy: fail-fast: false matrix: scala: - - 2.12.15 + - 2.12.15 steps: - - 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@v3 - with: - java-version: '11' - distribution: temurin - - name: Cache SBT - uses: actions/cache@v3 - with: - path: | - ~/.ivy2/local/ - ~/.ivy2/cache/ - ~/.sbt/ - ~/.coursier/ - key: | - ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-${{matrix.sbt-args}} - ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}- - ${{runner.os}}-${{matrix.scala}}- - - name: Run tests - run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} test - - name: Publish to Maven Central Repository - env: - GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}} - if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' && github.event_name != 'pull_request' }} - 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 + - 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@v3 + with: + java-version: "11" + distribution: temurin + - name: Cache SBT + uses: actions/cache@v3 + with: + path: | + ~/.ivy2/local/ + ~/.ivy2/cache/ + ~/.sbt/ + ~/.coursier/ + key: | + ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-${{matrix.sbt-args}} + ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}- + ${{runner.os}}-${{matrix.scala}}- + - name: Run tests + run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} test + - name: Publish to Maven Central Repository + env: + GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}} + if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' && github.event_name != 'pull_request' }} + 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 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 44/55] 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" Date: Tue, 14 Feb 2023 07:35:11 -0800 Subject: [PATCH 45/55] 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 46/55] 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 47/55] 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 48/55] 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" Date: Sat, 1 Jul 2023 14:55:34 -0700 Subject: [PATCH 49/55] 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 50/55] 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" Date: Sat, 1 Jul 2023 15:17:44 -0700 Subject: [PATCH 51/55] 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" Date: Sat, 1 Jul 2023 15:21:20 -0700 Subject: [PATCH 52/55] 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" Date: Sat, 1 Jul 2023 15:28:13 -0700 Subject: [PATCH 53/55] 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" Date: Sat, 1 Jul 2023 15:31:21 -0700 Subject: [PATCH 54/55] 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" Date: Sat, 1 Jul 2023 15:35:56 -0700 Subject: [PATCH 55/55] 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