From 64f8b344ef8865750dcdfa6d3d9fe9b300aadb02 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 21 Mar 2019 22:20:28 +0800 Subject: [PATCH 01/15] 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 02/15] 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 03/15] 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 04/15] 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 05/15] 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 06/15] 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 07/15] 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 08/15] 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 09/15] 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 10/15] 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 11/15] 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 12/15] 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 13/15] 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 14/15] 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 15/15] 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