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 1/9] Use SECRET_GIST instead of GITHUB_PERSONAL_ACCESS_TOKEN --- secret.sbt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/secret.sbt b/secret.sbt index 3279570..4c61823 100644 --- a/secret.sbt +++ b/secret.sbt @@ -1,15 +1,12 @@ lazy val secret = { - for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) yield { + for (gist <- sys.env.get("SECRET_GIST")) yield { val secret = project.settings(publishArtifact := false).in { val secretDirectory = file(sourcecode.File()).getParentFile / "secret" IO.delete(secretDirectory) org.eclipse.jgit.api.Git .cloneRepository() - .setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git") + .setURI(gist) .setDirectory(secretDirectory) - .setCredentialsProvider( - new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "") - ) .call() .close() secretDirectory From d95f4b8a44cd442ee2bff8cf41d4f615ac5b5b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 5 Jun 2019 13:23:51 -0700 Subject: [PATCH 2/9] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efed74b..18e2a7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,4 +33,4 @@ deploy: skip_cleanup: true on: all_branches: true - condition: $GITHUB_PERSONAL_ACCESS_TOKEN + condition: $SECRET_GIST From 3b875bff5977a95269326d92cdee7c5a8c147e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Mon, 10 Jun 2019 20:06:16 -0700 Subject: [PATCH 3/9] Update plugins.sbt --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 19a0e09..d0a869e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+50-a3bcec16") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From 9c3a0d3ac11073f985df40c37a2bcd567f3a4561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 20 Jun 2019 15:28:18 -0700 Subject: [PATCH 4/9] Upgrade sbt-dynver --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 381c38b..cbb65b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.0 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") From fa2d834842d7c155231e8c4de3e6cf1ccf70dcff Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 5 Sep 2019 12:27:21 -0700 Subject: [PATCH 5/9] Upgrade sbt --- project/build.properties | 2 +- project/coursier.sbt | 1 - project/project/plugins.sbt | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 project/coursier.sbt delete mode 100644 project/project/plugins.sbt diff --git a/project/build.properties b/project/build.properties index c0bab04..dfa772b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.0 \ No newline at end of file diff --git a/project/coursier.sbt b/project/coursier.sbt deleted file mode 100644 index 3a2d48e..0000000 --- a/project/coursier.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtCoursier diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt deleted file mode 100644 index bb02ff0..0000000 --- a/project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3") From 75bfab06e9254d5e414484c68e6d6afe1de06efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 5 Sep 2019 16:04:39 -0700 Subject: [PATCH 6/9] Use publish / skip --- secret.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secret.sbt b/secret.sbt index 4c61823..f3db5e8 100644 --- a/secret.sbt +++ b/secret.sbt @@ -1,6 +1,6 @@ lazy val secret = { for (gist <- sys.env.get("SECRET_GIST")) yield { - val secret = project.settings(publishArtifact := false).in { + val secret = project.settings(publish / skip := true).in { val secretDirectory = file(sourcecode.File()).getParentFile / "secret" IO.delete(secretDirectory) org.eclipse.jgit.api.Git From 880b43f10a4214e4ae234a8c3c3b1f679509c6e1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2019 14:28:56 +0200 Subject: [PATCH 7/9] Update sbt-sonatype to 3.6 --- .travis.yml | 2 +- project/plugins.sbt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18e2a7c..c6e0a43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_deploy: deploy: - provider: script - script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease + script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease skip_cleanup: true on: all_branches: true diff --git a/project/plugins.sbt b/project/plugins.sbt index 1fdca4b..b8ff82f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,8 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") +libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.9" + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") From 073623cec5ac0e813c191398127ffef36fa83d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Thu, 3 Oct 2019 22:17:57 -0700 Subject: [PATCH 8/9] Upgrade sbt-sonatype --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bb891c9..4842aae 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.7") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") From 94df7163c9aa62df6a80e23471970a77b91c0dc2 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 4 Oct 2019 09:10:59 -0700 Subject: [PATCH 9/9] Update build.properties --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dfa772b..8522443 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.0 \ No newline at end of file +sbt.version=1.3.2