From ddab88e8f317493d3c0bc8afe494656060107d5a Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Mon, 13 Aug 2018 19:27:26 +0800 Subject: [PATCH 01/37] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 64cf32f..5620cc5 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 02/37] 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 eecf48d..1d19447 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 03/37] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 5620cc5..c0bab04 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 04/37] Cache $HOME/.coursier/ --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0641d19..b386e3e 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 05/37] 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 3cc03af..a4c3943 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 06/37] 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 1d19447..d4e1604 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 07/37] 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 1043c84..3661f11 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 74f5328..db22c5d 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 d6069da..9d6a568 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 08/37] Deploy on tags --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3661f11..bf2ba27 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 09/37] Fix deploy condition --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf2ba27..928bd22 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 10/37] 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 928bd22..231cc15 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 11/37] 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 231cc15..0f8985d 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 12/37] 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 db22c5d..5a13322 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 13/37] 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 5a13322..67dce0e 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 14/37] 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 0f8985d..1a0b084 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 67dce0e..e730667 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 15/37] 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 1a0b084..dd5667c 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 16/37] 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 e730667..64e3137 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 17/37] 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 64e3137..4d274e3 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 18/37] 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 4d274e3..1e36fc0 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 19/37] Setup Scalafmt version --- .scalafmt.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.scalafmt.conf b/.scalafmt.conf index e661d6c..f216dbf 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 20/37] 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 1e36fc0..5b51856 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 21/37] 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 0000000..7fd7b2d --- /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 22/37] 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 0000000..3a2d48e --- /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 0000000..08e93dc --- /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 23/37] 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 7fd7b2d..0000000 --- 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 24/37] 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 5b51856..d91885c 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 25/37] 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 08e93dc..689483f 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 26/37] 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 d91885c..0973cc9 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 27/37] 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 689483f..76801d0 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 28/37] 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 0973cc9..ccf4f4a 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 29/37] 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 ccf4f4a..253a2df 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 30/37] 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 253a2df..ca0eadd 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 31/37] 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 9d6a568..3279570 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 32/37] Set Scala version --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index dd5667c..ee9db4e 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 33/37] 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 ca0eadd..19a0e09 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 34/37] 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 76801d0..bb02ff0 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 35/37] Switch CI to OpenJDK --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee9db4e..efed74b 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 14bfdd12bb620bfbe1d5a28bac63ef1b25d7a96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 30 Aug 2018 14:08:05 +0800 Subject: [PATCH 36/37] Build for Scala 2.13.0 --- .travis.yml | 2 +- build.sbt | 3 ++- covariant/build.sbt.shared | 4 ++-- invariant/build.sbt.shared | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad8ddf7..f130242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ scala: - 2.10.7 - 2.11.12 - 2.12.8 - - 2.13.0-RC2 + - 2.13.0 jdk: - openjdk8 diff --git a/build.sbt b/build.sbt index 6113e5d..d4c41bd 100644 --- a/build.sbt +++ b/build.sbt @@ -48,6 +48,7 @@ publishArtifact := false lazy val unidoc = project .enablePlugins(ScalaUnidocPlugin) .settings( - addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1"), + unidocProjectFilter in ScalaUnidoc in BaseUnidocPlugin.autoImport.unidoc := inProjects(invariantJVM, covariantJVM), + addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3"), scalacOptions += "-Xexperimental" ) diff --git a/covariant/build.sbt.shared b/covariant/build.sbt.shared index 74940d4..5d2a766 100644 --- a/covariant/build.sbt.shared +++ b/covariant/build.sbt.shared @@ -7,9 +7,9 @@ libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.27" libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.27" -libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0-SNAP11" % Test +libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.8" % Test -addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1") +addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3") sourceGenerators in Test := { (sourceGenerators in Test).value.filterNot { sourceGenerator => diff --git a/invariant/build.sbt.shared b/invariant/build.sbt.shared index 6dcb7bc..0341092 100644 --- a/invariant/build.sbt.shared +++ b/invariant/build.sbt.shared @@ -7,11 +7,11 @@ libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.27" libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.27" -libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0-SNAP11" % Test +libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.8" % Test libraryDependencies += "org.scalaz" %% "scalaz-concurrent" % "7.2.27" % Test -addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1") +addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3") sourceGenerators in Test := { (sourceGenerators in Test).value.filterNot { sourceGenerator => From d2b835882d7394433988d6efa2055116de1c292b Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Mon, 10 Jun 2019 13:41:52 -0700 Subject: [PATCH 37/37] Build unidoc in the parent project --- build.sbt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index d4c41bd..8ce3c2b 100644 --- a/build.sbt +++ b/build.sbt @@ -43,12 +43,12 @@ lazy val covariantJS = covariant.js organization in ThisBuild := "com.thoughtworks.tryt" -publishArtifact := false - -lazy val unidoc = project - .enablePlugins(ScalaUnidocPlugin) - .settings( - unidocProjectFilter in ScalaUnidoc in BaseUnidocPlugin.autoImport.unidoc := inProjects(invariantJVM, covariantJVM), - addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3"), - scalacOptions += "-Xexperimental" - ) +publish / skip := false + +enablePlugins(ScalaUnidocPlugin) + +unidocProjectFilter in ScalaUnidoc in unidoc := inProjects(invariantJVM, covariantJVM) + +addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3") + +scalacOptions += "-Xexperimental"