From bea2ecd9f1b93e16999979a18f28d584d9158900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Sat, 12 May 2018 11:01:58 +0800 Subject: [PATCH 001/127] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 787a3364..eecf48d8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.0.1") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.0.2") From ddab88e8f317493d3c0bc8afe494656060107d5a Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Mon, 13 Aug 2018 19:27:26 +0800 Subject: [PATCH 002/127] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 64cf32f7..5620cc50 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.4 +sbt.version=1.2.1 From 189d762cdd417b29f4c8d0c20379cec8c72654e3 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Tue, 14 Aug 2018 11:57:08 +0800 Subject: [PATCH 003/127] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index eecf48d8..1d194472 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.0.2") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.0.3") From 3e1bb3e45b351cec9bf43391e4bba0bb24a8fced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 10 Jan 2019 03:13:06 +0800 Subject: [PATCH 004/127] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 5620cc50..c0bab049 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.1 +sbt.version=1.2.8 From c23bb51eb4eb280d4f188e395f51fc00bd99a146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Sun, 10 Mar 2019 23:09:30 +0800 Subject: [PATCH 005/127] Cache $HOME/.coursier/ --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0641d194..b386e3ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ cache: directories: - $HOME/.ivy2/cache - $HOME/.sbt/boot/ + - $HOME/.coursier/ script: From fcad446c95de1a8da8f3019f0685f5271f458709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Mon, 11 Mar 2019 17:43:23 +0800 Subject: [PATCH 006/127] Remove enablePlugins(Travis) since it is automatically triggered --- deploy.sbt.disabled | 2 -- 1 file changed, 2 deletions(-) diff --git a/deploy.sbt.disabled b/deploy.sbt.disabled index 3cc03afb..a4c39434 100644 --- a/deploy.sbt.disabled +++ b/deploy.sbt.disabled @@ -1,5 +1,3 @@ -enablePlugins(Travis) - lazy val secret = project.settings(publishArtifact := false).in { val secretDirectory = file(sourcecode.File()).getParentFile / "secret" sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN").foreach { token => From d83ce69731c2bd3f2621300b95b089fcee28a700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Tue, 12 Mar 2019 09:22:22 +0800 Subject: [PATCH 007/127] 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 1d194472..d4e1604a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.0.3") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.1.0") From b01e0fc8c08819619cf7cc96631688aa8f50724e Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Tue, 12 Mar 2019 17:14:38 +0800 Subject: [PATCH 008/127] Upgrade sbt-best-practice to use sbt-release-early --- .travis.yml | 9 ++------- project/plugins.sbt | 2 +- deploy.sbt.disabled => secret.sbt | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) rename deploy.sbt.disabled => secret.sbt (84%) diff --git a/.travis.yml b/.travis.yml index 1043c84b..3661f117 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,15 +22,10 @@ cache: before_script: -script: - - sbt +test - before_deploy: deploy: skip_cleanup: true provider: script - script: sbt "release with-defaults" - on: - condition: -e ./deploy.sbt - all_branches: true + script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly + diff --git a/project/plugins.sbt b/project/plugins.sbt index 74f53285..db22c5dc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.1.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.2.0") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0") diff --git a/deploy.sbt.disabled b/secret.sbt similarity index 84% rename from deploy.sbt.disabled rename to secret.sbt index d6069dae..9d6a568b 100644 --- a/deploy.sbt.disabled +++ b/secret.sbt @@ -1,8 +1,6 @@ -enablePlugins(SonatypeRelease) - lazy val secret = project.settings(publishArtifact := false).in { val secretDirectory = file(sourcecode.File()).getParentFile / "secret" - sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN").foreach { token => + for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) { IO.delete(secretDirectory) org.eclipse.jgit.api.Git .cloneRepository() From c220ad225b2ec6e5665d3011e4e587c441699071 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Tue, 12 Mar 2019 18:12:55 +0800 Subject: [PATCH 009/127] Deploy on tags --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3661f117..bf2ba27c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ before_script: before_deploy: deploy: + condition: $TRAVIS_BRANCH = master || $TRAVIS_TAG skip_cleanup: true provider: script script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly From 60950e2fe902eeda09b0451206eadbf85705f16e Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Tue, 12 Mar 2019 18:29:51 +0800 Subject: [PATCH 010/127] Fix deploy condition --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf2ba27c..928bd22b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,9 @@ before_script: before_deploy: deploy: - condition: $TRAVIS_BRANCH = master || $TRAVIS_TAG + on: + all_branches: true + condition: $TRAVIS_BRANCH = master || $TRAVIS_TAG skip_cleanup: true provider: script script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly From 41431c636b9245f60b74d60887964604ef1daaaa Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 13 Mar 2019 10:21:08 +0800 Subject: [PATCH 011/127] Try to fix the deploy condition --- .travis.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 928bd22b..231cc15c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,13 @@ before_script: before_deploy: deploy: - on: - all_branches: true - condition: $TRAVIS_BRANCH = master || $TRAVIS_TAG - skip_cleanup: true - provider: script - script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly - + - provider: script + script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly + skip_cleanup: true + on: + branch: master + - provider: script + script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly + skip_cleanup: true + on: + tags: true From 3b3501b93d9fbe15e84a6c9bdcf253645129d415 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 13 Mar 2019 16:14:40 +0800 Subject: [PATCH 012/127] Enable sbt-release-early on all branches --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 231cc15c..0f8985d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,4 @@ deploy: script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly skip_cleanup: true on: - branch: master - - provider: script - script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly - skip_cleanup: true - on: - tags: true + all_branches: true From ed5bd0d9579c27b2131c90d141aec03d912a1831 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 13 Mar 2019 15:57:19 +0800 Subject: [PATCH 013/127] Update sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index db22c5dc..5a13322d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.2.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.2.0+11-57cbe030") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0") From aff71a00870750f354149f7748db20bee72c8374 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 13 Mar 2019 18:22:19 +0800 Subject: [PATCH 014/127] Upgrade sbt-best-practice to 5.0.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5a13322d..67dce0eb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.2.0+11-57cbe030") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "5.0.0") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0") From ad6377ebc99109c9df527ec3fca2ce286708bef0 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 14 Mar 2019 18:25:10 +0800 Subject: [PATCH 015/127] Upgrade sbt-best-practice to 6.0.0 --- .travis.yml | 2 +- project/plugins.sbt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f8985d1..1a0b084b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_deploy: deploy: - provider: script - script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly + script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease skip_cleanup: true on: all_branches: true diff --git a/project/plugins.sbt b/project/plugins.sbt index 67dce0eb..e730667c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,7 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "5.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "6.0.0") + +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") + +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0") From ed8f2152ab02e2e70e14c0b2724dd6df895a8f60 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 14 Mar 2019 10:14:18 +0800 Subject: [PATCH 016/127] Don't deploy unless $GITHUB_PERSONAL_ACCESS_TOKEN is present --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1a0b084b..dd5667cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,3 +30,4 @@ deploy: skip_cleanup: true on: all_branches: true + condition: $GITHUB_PERSONAL_ACCESS_TOKEN From 07d7d9acca78f95d49ea159261ae15b563233077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Sat, 16 Mar 2019 11:10:24 +0800 Subject: [PATCH 017/127] 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 e730667c..64e31379 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") -addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0") +addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") From 9ac96472a1001043e81b0c317bddc98295c50cf0 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Sat, 16 Mar 2019 12:23:16 +0800 Subject: [PATCH 018/127] Upgrade sonatype and sbt-best-practice --- project/plugins.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 64e31379..4d274e31 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,6 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "6.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.0") + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") From 64f8b344ef8865750dcdfa6d3d9fe9b300aadb02 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 21 Mar 2019 22:20:28 +0800 Subject: [PATCH 019/127] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4d274e31..1e36fc0d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From 1e73dfa1dc5d64460439cad0839e567ed0e9164b Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 27 Mar 2019 03:01:14 +0800 Subject: [PATCH 020/127] Setup Scalafmt version --- .scalafmt.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.scalafmt.conf b/.scalafmt.conf index e661d6c1..f216dbfd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1 +1,2 @@ +version = "1.5.1" maxColumn = 120 \ No newline at end of file From cad0cb42abba01405f7ddf00a5b0d5740fcf3bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 27 Mar 2019 16:28:03 +0800 Subject: [PATCH 021/127] 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 1e36fc0d..5b518560 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+14-76cb6848") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") From 13a9465e183bec715b01235d596f316540f25ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 27 Mar 2019 16:30:51 +0800 Subject: [PATCH 022/127] Create dynver-dash-separator.sbt Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14 --- dynver-dash-separator.sbt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 dynver-dash-separator.sbt diff --git a/dynver-dash-separator.sbt b/dynver-dash-separator.sbt new file mode 100644 index 00000000..7fd7b2d6 --- /dev/null +++ b/dynver-dash-separator.sbt @@ -0,0 +1,2 @@ +// Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14 +ThisBuild / dynverSeparator := "-" From 8f4803047b14f9c77436ceda3c613e624bab3096 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 27 Mar 2019 16:43:39 +0800 Subject: [PATCH 023/127] Use coursier by default --- project/coursier.sbt | 1 + project/project/plugins.sbt | 1 + 2 files changed, 2 insertions(+) create mode 100644 project/coursier.sbt create mode 100644 project/project/plugins.sbt diff --git a/project/coursier.sbt b/project/coursier.sbt new file mode 100644 index 00000000..3a2d48ea --- /dev/null +++ b/project/coursier.sbt @@ -0,0 +1 @@ +addSbtCoursier diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt new file mode 100644 index 00000000..08e93dc8 --- /dev/null +++ b/project/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M11") From 0e05d323688a9d8d1c927c3fa5c46f88bf65671d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Sun, 31 Mar 2019 17:04:40 +0800 Subject: [PATCH 024/127] Delete dynver-dash-separator.sbt --- dynver-dash-separator.sbt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 dynver-dash-separator.sbt diff --git a/dynver-dash-separator.sbt b/dynver-dash-separator.sbt deleted file mode 100644 index 7fd7b2d6..00000000 --- a/dynver-dash-separator.sbt +++ /dev/null @@ -1,2 +0,0 @@ -// Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14 -ThisBuild / dynverSeparator := "-" From f245f55b0d21fcc05c023c2a520c349676cd212b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Mon, 1 Apr 2019 02:09:46 +0800 Subject: [PATCH 025/127] Add sbt-example by default --- project/plugins.sbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5b518560..d91885c2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,3 +7,5 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+14-76cb6848") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") + +addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1") From 1f559388954b2c3b9371b417a0489647be4337ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Tue, 2 Apr 2019 15:59:04 +0800 Subject: [PATCH 026/127] Upgrade Coursier --- project/project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index 08e93dc8..689483f3 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M11") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-2") From 29a78a384be133d66a57010e246d4820320791da Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Fri, 5 Apr 2019 15:39:02 +0800 Subject: [PATCH 027/127] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d91885c2..0973cc9e 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") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+9-73e78eb9") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From 8e7b48234aa2af482e28ea21a7f300b6aa538ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Tue, 9 Apr 2019 13:40:54 +0800 Subject: [PATCH 028/127] Update plugins.sbt --- project/project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index 689483f3..76801d04 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-2") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-4") From 64cca2ec5fad218effdbf5a7c5474734ebbbf5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 10 Apr 2019 19:46:29 +0800 Subject: [PATCH 029/127] Update sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0973cc9e..ccf4f4a1 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+9-73e78eb9") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+15-cee258f3") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From d2a4120b71deebf89a83e958d3a1f3e3e374b42a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 10 Apr 2019 20:22:42 +0800 Subject: [PATCH 030/127] Update sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ccf4f4a1..253a2df0 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+15-cee258f3") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+27-86aa16d3") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From 81cf5b6e609f110483438c12693aff4d5bdd828c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 11 Apr 2019 01:01:57 +0800 Subject: [PATCH 031/127] Update sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 253a2df0..ca0eadd8 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+27-86aa16d3") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From 76f6cd8bf61c300f6e3b34bc9b3b2bff682511e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 11 Apr 2019 21:59:27 +0800 Subject: [PATCH 032/127] Don't create secret project unless GITHUB_PERSONAL_ACCESS_TOKEN is set --- secret.sbt | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/secret.sbt b/secret.sbt index 9d6a568b..32795700 100644 --- a/secret.sbt +++ b/secret.sbt @@ -1,16 +1,19 @@ -lazy val secret = project.settings(publishArtifact := false).in { - val secretDirectory = file(sourcecode.File()).getParentFile / "secret" - for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) { - IO.delete(secretDirectory) - org.eclipse.jgit.api.Git - .cloneRepository() - .setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git") - .setDirectory(secretDirectory) - .setCredentialsProvider( - new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "") - ) - .call() - .close() +lazy val secret = { + for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) 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") + .setDirectory(secretDirectory) + .setCredentialsProvider( + new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "") + ) + .call() + .close() + secretDirectory + } + secret } - secretDirectory -} +}.getOrElse(null) From a8516803dac6bb8e435b9a4c8cf985b6b7099e11 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Sun, 28 Apr 2019 09:47:05 +0800 Subject: [PATCH 033/127] Set Scala version --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index dd5667cf..ee9db4ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ addons: language: scala +scala: + - 2.12.8 + jdk: - oraclejdk8 From a7f8bd7fe9fbbc0fa46ff742645d4aba12d67369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Mon, 6 May 2019 22:34:09 +0800 Subject: [PATCH 034/127] 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 ca0eadd8..19a0e097 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+14-76cb6848") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") From ed166ae06293c74fc5c8bdfd5e1d819552582447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Tue, 7 May 2019 17:43:56 +0800 Subject: [PATCH 035/127] Upgrade sbt-coursier --- project/project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index 76801d04..bb02ff0e 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-4") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3") From 90a2eb6b8061f65cb2228e15396b789b41fe71d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Mon, 20 May 2019 13:03:21 -0700 Subject: [PATCH 036/127] Switch CI to OpenJDK --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee9db4ee..efed74b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ scala: - 2.12.8 jdk: - - oraclejdk8 + - openjdk8 before_cache: - find $HOME/.sbt -name '*.lock' -delete 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 037/127] 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 32795700..4c618239 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 038/127] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efed74b2..18e2a7c3 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 039/127] 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 19a0e097..d0a869e6 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 b78111e27373d3f237bd8173e3ac76f9de8b99cb Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 12 Jun 2019 00:07:08 -0700 Subject: [PATCH 040/127] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 19a0e097..381c38b9 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.1.0") 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 041/127] 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 381c38b9..cbb65b36 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 d2f5887b4883c093772de903c82960261bc8100c 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 042/127] 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 381c38b9..cbb65b36 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 54cccf458c63b54fe658a9f1ad786237ac7e8064 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Sun, 23 Jun 2019 00:52:58 -0700 Subject: [PATCH 043/127] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index cbb65b36..1fdca4bc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From fa2d834842d7c155231e8c4de3e6cf1ccf70dcff Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 5 Sep 2019 12:27:21 -0700 Subject: [PATCH 044/127] 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 c0bab049..dfa772b9 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 3a2d48ea..00000000 --- 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 bb02ff0e..00000000 --- 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 045/127] Use publish / skip --- secret.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secret.sbt b/secret.sbt index 4c618239..f3db5e8e 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 424108e704c76479ae336ad80acf8d1f540dc60b 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:16:42 -0700 Subject: [PATCH 046/127] Use publish / skip --- secret.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secret.sbt b/secret.sbt index 32795700..bb264c7b 100644 --- a/secret.sbt +++ b/secret.sbt @@ -1,6 +1,6 @@ lazy val secret = { for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) 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 fdc190cb16b03e4a4a617965cc5ba97a461907fa Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 5 Sep 2019 12:27:21 -0700 Subject: [PATCH 047/127] 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 c0bab049..dfa772b9 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 3a2d48ea..00000000 --- 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 bb02ff0e..00000000 --- a/project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3") From 880b43f10a4214e4ae234a8c3c3b1f679509c6e1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2019 14:28:56 +0200 Subject: [PATCH 048/127] 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 18e2a7c3..c6e0a43a 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 1fdca4bc..b8ff82f0 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 a4ebaf611ce72ea0f0c384779c0171a82de5d98e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2019 14:28:56 +0200 Subject: [PATCH 049/127] 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 efed74b2..7ed3a0a7 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 1fdca4bc..b8ff82f0 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 ba2cee0479612398dba8525e60d4ee93b94efbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 11 Sep 2019 16:38:32 -0700 Subject: [PATCH 050/127] Upgrade sbt-sonatype --- project/plugins.sbt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b8ff82f0..bb891c9b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,6 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") -libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.9" - -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.7") 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 051/127] 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 bb891c9b..4842aae6 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 052/127] 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 dfa772b9..8522443d 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 e125d0b6e6de9efd59649d2ec72ac771a277a36d Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 4 Oct 2019 09:14:25 -0700 Subject: [PATCH 053/127] 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 bb891c9b..4842aae6 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 d13490b91b93cdea1fb93f279faa42c17d6d4ba9 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 4 Oct 2019 10:00:07 -0700 Subject: [PATCH 054/127] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dfa772b9..8522443d 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 d80070d7def9da4dda0f49eb29bc68804304d0fd Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 21 Nov 2019 18:25:20 -0800 Subject: [PATCH 055/127] Create .gitpod.yml --- .gitpod.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 00000000..c0194336 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,5 @@ +image: instructure/scala-sbt:1.2 +vscode: + extensions: + - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== + - scalameta.metals@1.6.0:Yi5jjDJjIyozrOuZIWFt/g== From bd2c2aad031b5462575cf3e422c1ac39baae7c49 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 21 Nov 2019 18:37:13 -0800 Subject: [PATCH 056/127] Ignore Metals files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d180f4bd..1ecb4e01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ target/ local.sbt secret/ +.metals/ +.bloop/ From 7d7fcc80f7931fc60fcf868f1709a2ac18cad5b2 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 22 Nov 2019 03:18:03 +0000 Subject: [PATCH 057/127] Switch to a docker image that supports Node.js --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index c0194336..6db8e4ce 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: instructure/scala-sbt:1.2 +image: igeolise/scalajs-test-runner:latest vscode: extensions: - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== From ad26ea5eccecfee47a9a09f671f11e2000a963dd Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 23 Nov 2019 19:36:10 -0800 Subject: [PATCH 058/127] Update .scalafmt.conf --- .scalafmt.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index f216dbfd..9c1a40ca 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,2 +1,2 @@ -version = "1.5.1" -maxColumn = 120 \ No newline at end of file +version = "2.2.2" +maxColumn = 120 From 44904216609827d158abdfb9ff17c2e76cae1fec Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 23 Nov 2019 21:54:46 -0800 Subject: [PATCH 059/127] Upgrade metals --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 6db8e4ce..b7d40fe3 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,4 +2,4 @@ image: igeolise/scalajs-test-runner:latest vscode: extensions: - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== - - scalameta.metals@1.6.0:Yi5jjDJjIyozrOuZIWFt/g== + - scalameta.metals@1.6.3:pVVu91DEAijx+sPKu8fgHA== From c682fefe70d42dc829247432f43d78ba9c64b987 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 2 Dec 2019 22:35:45 -0800 Subject: [PATCH 060/127] Update sbt-example --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4842aae6..c8202f94 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") -addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1") +addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0") From 50a24861fe1f2a65483350f0a7731fde108b1c06 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 18 Apr 2020 18:26:28 -0700 Subject: [PATCH 061/127] Ignore more Metals files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1ecb4e01..24f4eb65 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ local.sbt secret/ .metals/ .bloop/ +project/metals.sbt From f863c3a6b535441e240a558529d9fafec46307eb Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 18 Apr 2020 22:43:51 -0700 Subject: [PATCH 062/127] Update JDK version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ed3a0a7..8208d2c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ scala: - 2.12.8 jdk: - - openjdk8 + - openjdk11 before_cache: - find $HOME/.sbt -name '*.lock' -delete From 9b1fde028a85cb768c9cf8b671f64659e4733810 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 13:17:56 -0700 Subject: [PATCH 063/127] Clear cache according to https://www.scala-sbt.org/1.x/docs/Travis-CI-with-sbt.html#Caching --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8208d2c7..8e61b099 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,9 @@ jdk: - openjdk11 before_cache: - - find $HOME/.sbt -name '*.lock' -delete - - find $HOME/.ivy2 -name 'ivydata-*.properties' -delete + - rm -fv $HOME/.ivy2/.sbt.ivy.lock + - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete + - find $HOME/.sbt -name "*.lock" -print -delete cache: directories: From 680293ce37973ddf1e96b8e595b6cd1f412c6fc2 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 13:28:26 -0700 Subject: [PATCH 064/127] Migrate deprecated Travis CI settings --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e61b099..acf0cc58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -sudo: false - addons: apt: packages: @@ -31,7 +29,7 @@ before_deploy: deploy: - provider: script 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 + cleanup: false on: all_branches: true condition: $GITHUB_PERSONAL_ACCESS_TOKEN From 03cedbf25585bfd54d707cf8877649b98dd05a32 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 13:47:21 -0700 Subject: [PATCH 065/127] Update cache directory according to https://www.scala-sbt.org/1.x/docs/Travis-CI-with-sbt.html#Caching --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index acf0cc58..230ca9d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ before_cache: cache: directories: + - $HOME/.cache/coursier - $HOME/.ivy2/cache - - $HOME/.sbt/boot/ - - $HOME/.coursier/ + - $HOME/.sbt before_script: From b947e2d086dd2d2b7e45c0f0ae4167bfe4ba2dc9 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 14:19:45 -0700 Subject: [PATCH 066/127] Switch to dpl v2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 230ca9d1..49dcd279 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ deploy: - provider: script 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 cleanup: false + edge: true on: all_branches: true condition: $GITHUB_PERSONAL_ACCESS_TOKEN From 64470597e7c288ef476d0f9d8f6451bfd260bb74 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 29 May 2020 23:31:09 +0000 Subject: [PATCH 067/127] Update Metals --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index b7d40fe3..cd17bda2 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,4 +2,4 @@ image: igeolise/scalajs-test-runner:latest vscode: extensions: - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== - - scalameta.metals@1.6.3:pVVu91DEAijx+sPKu8fgHA== + - scalameta.metals@1.9.0:EyAIfy0ykjUn9htpw3f7GA== \ No newline at end of file From ccbecaa37d5a3516fe95fadda80ae0919346239d Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 11:18:36 -0700 Subject: [PATCH 068/127] Also ignore project/project/metals.sbt --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 24f4eb65..1cb04be5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ local.sbt secret/ .metals/ .bloop/ -project/metals.sbt +metals.sbt From 24038c56ee989dfcd2927145aa9d0554813fcd65 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:27:22 -0700 Subject: [PATCH 069/127] Add .vscode/ --- .vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..32cfc61d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.watcherExclude": { + "**/target": true + } +} \ No newline at end of file From bd7a8d7481fdf7eea6b36cccc696322e3f6d1a26 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 09:34:32 -0700 Subject: [PATCH 070/127] Set up Github Actions --- .github/workflows/scala.yml | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/scala.yml diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml new file mode 100644 index 00000000..31792710 --- /dev/null +++ b/.github/workflows/scala.yml @@ -0,0 +1,42 @@ +name: Scala CI + +on: +- push +- pull_request + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + scala: + - 2.12.8 + + steps: + - uses: actions/checkout@v2 + 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 + with: + java-version: '11' + distribution: 'adopt' + - name: Cache SBT + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache/ + ~/.sbt/ + ~/.coursier/ + key: | + ${{ runner.os }}-${{matrix.scala}}-${{ hashFiles('**/*.sbt') }} + ${{ runner.os }}-${{matrix.scala}}- + - name: Run tests + run: sbt ++${{ matrix.scala }} test + - name: Publish to Maven Central Repository + env: + GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}} + if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' }} + 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 c77da292b3e421f9bbdd5645a3bb7e77652ded9a Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:29:16 -0700 Subject: [PATCH 071/127] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c8202f94..0bdc8bcd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.0.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") From 4536453d8f90415162b31c9237a6bbed5c59d0b7 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:30:04 -0700 Subject: [PATCH 072/127] Remove Travis CI configuration --- .travis.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 49dcd279..00000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -addons: - apt: - packages: - - graphviz - -language: scala - -scala: - - 2.12.8 - -jdk: - - openjdk11 - -before_cache: - - rm -fv $HOME/.ivy2/.sbt.ivy.lock - - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete - - find $HOME/.sbt -name "*.lock" -print -delete - -cache: - directories: - - $HOME/.cache/coursier - - $HOME/.ivy2/cache - - $HOME/.sbt - -before_script: - -before_deploy: - -deploy: - - provider: script - 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 - cleanup: false - edge: true - on: - all_branches: true - condition: $GITHUB_PERSONAL_ACCESS_TOKEN From 5d87b7d365bd5e279b71f02946d970d2f170a551 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:42:45 -0700 Subject: [PATCH 073/127] Upgrade sbt to 1.5.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8522443d..10fd9eee 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.2 +sbt.version=1.5.5 From aea68e93d24296195ffccc3b81dba80734f1320f Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 23:03:45 -0700 Subject: [PATCH 074/127] Ignore .bsp/sbt.json --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1cb04be5..5387d4b3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ secret/ .metals/ .bloop/ metals.sbt +.bsp/sbt.json From 68d057622d54bd3e58289f4283eae42bc27df314 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 6 Nov 2021 12:47:52 -0700 Subject: [PATCH 075/127] Don't fail fast --- .github/workflows/scala.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 31792710..79239f67 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -10,6 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: scala: - 2.12.8 From 5e3c91e911a5fe16686e84bb68e9d6c151509cd1 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 11 Nov 2021 16:18:37 -0800 Subject: [PATCH 076/127] Add a random number into sonatypeSessionName --- .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 79239f67..b9625551 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -40,4 +40,4 @@ jobs: env: GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}} if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' }} - 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.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease From b8e8c87e02bc733d7aff1148131241648eb9ad4f Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 13 Nov 2021 00:01:08 -0800 Subject: [PATCH 077/127] Cache ~/.ivy/local for Github Actions --- .github/workflows/scala.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index b9625551..7796cccf 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -28,6 +28,7 @@ jobs: uses: actions/cache@v2 with: path: | + ~/.ivy2/local/ ~/.ivy2/cache/ ~/.sbt/ ~/.coursier/ From b4969d0cf78de600b9df9c54a242dde2b6f92ef5 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 16 Nov 2021 18:49:30 -0800 Subject: [PATCH 078/127] Add runner.dialect and update scalafmt version --- .scalafmt.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9c1a40ca..a6300edd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,2 +1,3 @@ -version = "2.2.2" +runner.dialect = "scala213" +version = "3.1.1" maxColumn = 120 From a29a0e31f50f4d822c837a84b4b3cfcd5b02994a Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sun, 5 Dec 2021 22:33:26 -0800 Subject: [PATCH 079/127] Update sbt-best-practice to 8.2.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0bdc8bcd..38bc3b08 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") From 9f9cf58088b8236e47cc8fbebf009bb5647c015a Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 7 Dec 2021 01:38:30 -0800 Subject: [PATCH 080/127] Set maxColumn to 80 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a6300edd..26467aa1 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = "scala213" version = "3.1.1" -maxColumn = 120 +maxColumn = 80 From a353ce68acb08fd6c56ad66ccb476237cecab0b7 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 7 Dec 2021 18:28:20 -0800 Subject: [PATCH 081/127] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5387d4b3..51b7c9dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ secret/ .bloop/ metals.sbt .bsp/sbt.json +.vscode/launch.json From 74ed2d73e404ac3c58bf791b1663e1b601e82525 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 27 Dec 2021 11:00:01 -0800 Subject: [PATCH 082/127] 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 7796cccf..06ead645 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 083/127] Ignore *.scala.semanticdb --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 51b7c9dd..1b716451 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 084/127] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1b716451..5701ab54 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 085/127] 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 06ead645..78a21b04 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 086/127] 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 10fd9eee..6a9f0388 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 087/127] 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 38bc3b08..9c29eba7 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 088/127] 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 26467aa1..da2a9c4a 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 089/127] 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 78a21b04..72126ac8 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 090/127] 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 00000000..ae32d8a0 --- /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 091/127] 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 ae32d8a0..b18a27b5 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 092/127] 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 da2a9c4a..2ae5414d 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 093/127] 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 9c29eba7..53533ff7 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 bb264c7b..30146215 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 094/127] 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 00000000..a94ba1fe --- /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 095/127] 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 2ae5414d..094ff9ba 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 096/127] 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 53533ff7..19fced35 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 097/127] 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 6a9f0388..46e43a97 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 098/127] 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 19fced35..3ecf26e2 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 099/127] 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 3ecf26e2..3e7d8062 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 100/127] 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 3e7d8062..b797e5cf 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 101/127] 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 b797e5cf..7ca68870 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 102/127] 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 7ca68870..987080bb 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 103/127] 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 987080bb..1ef88735 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 104/127] 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 1ef88735..96ffca3d 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 105/127] 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 b18a27b5..449cd0eb 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 106/127] 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 72126ac8..7cfd92c0 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 107/127] 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 7cfd92c0..bd9b0f88 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 108/127] 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 449cd0eb..f04f7033 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 109/127] 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 96ffca3d..13f6c8a1 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 110/127] 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 094ff9ba..d4dfbab9 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 111/127] 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 bd9b0f88..6b004dd6 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 112/127] 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 13f6c8a1..31256dbb 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 113/127] 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 6b004dd6..eb2e4db3 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 114/127] 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 eb2e4db3..50460458 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 115/127] 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 f04f7033..5350439b 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 50460458..4f71e118 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 116/127] 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 31256dbb..183c101c 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 117/127] 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 183c101c..00000000 --- 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 00000000..13402491 --- /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 118/127] 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 119/127] 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 d4dfbab9..e26dcdbc 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 120/127] 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 46e43a97..72413de1 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 121/127] 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 00000000..2323a1f8 --- /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 122/127] 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 72413de1..3c0b78a7 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 123/127] 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 2323a1f8..e72da06c 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 124/127] 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 e72da06c..0eef2e56 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 125/127] 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 0eef2e56..90ec8619 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 126/127] 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 cd17bda2..00000000 --- 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 127/127] 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 90ec8619..982e6391 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