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 01/18] 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 02/18] 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 03/18] 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 04/18] 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 05/18] 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 06/18] 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 07/18] 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 08/18] 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 09/18] 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 b78111e27373d3f237bd8173e3ac76f9de8b99cb Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 12 Jun 2019 00:07:08 -0700 Subject: [PATCH 10/18] 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 19a0e09..381c38b 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 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 11/18] Upgrade sbt-dynver --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 381c38b..cbb65b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.0 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") From 54cccf458c63b54fe658a9f1ad786237ac7e8064 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Sun, 23 Jun 2019 00:52:58 -0700 Subject: [PATCH 12/18] 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 cbb65b3..1fdca4b 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 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 13/18] Use publish / skip --- secret.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secret.sbt b/secret.sbt index 3279570..bb264c7 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 14/18] Upgrade sbt --- project/build.properties | 2 +- project/coursier.sbt | 1 - project/project/plugins.sbt | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 project/coursier.sbt delete mode 100644 project/project/plugins.sbt diff --git a/project/build.properties b/project/build.properties index c0bab04..dfa772b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.0 \ No newline at end of file diff --git a/project/coursier.sbt b/project/coursier.sbt deleted file mode 100644 index 3a2d48e..0000000 --- a/project/coursier.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtCoursier diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt deleted file mode 100644 index bb02ff0..0000000 --- a/project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3") From a4ebaf611ce72ea0f0c384779c0171a82de5d98e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2019 14:28:56 +0200 Subject: [PATCH 15/18] 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 efed74b..7ed3a0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_deploy: deploy: - provider: script - script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease + script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease skip_cleanup: true on: all_branches: true diff --git a/project/plugins.sbt b/project/plugins.sbt index 1fdca4b..b8ff82f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,8 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") +libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.9" + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") From 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 16/18] 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 b8ff82f..bb891c9 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 e125d0b6e6de9efd59649d2ec72ac771a277a36d Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 4 Oct 2019 09:14:25 -0700 Subject: [PATCH 17/18] Upgrade sbt-sonatype --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bb891c9..4842aae 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.7") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") From d13490b91b93cdea1fb93f279faa42c17d6d4ba9 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 4 Oct 2019 10:00:07 -0700 Subject: [PATCH 18/18] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dfa772b..8522443 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.0 \ No newline at end of file +sbt.version=1.3.2