ThoughtWorksInc · Atry · Dec 4, 2019 · Apr 10, 2019 · Apr 10, 2019 · Apr 10, 2019
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@ project/plugins/project/
 
 local.sbt
 secret/
+.metals/
+.bloop/
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -0,0 +1,5 @@
+image: igeolise/scalajs-test-runner:latest
+vscode:
+  extensions:
+    - [email protected]:wQBBM+lKILHBqOqlqW60xA==
+    - [email protected]:pVVu91DEAijx+sPKu8fgHA==
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,2 +1,2 @@
-version = "1.5.1"
-maxColumn = 120
+version = "2.2.2"
+maxColumn = 120
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ scala:
   - 2.13.0
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 before_cache:
   - find $HOME/.sbt -name '*.lock' -delete
@@ -32,7 +32,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/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.2
diff --git a/project/coursier.sbt b/project/coursier.sbt
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+9-73e78eb9")
+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
 
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+14-76cb6848")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 

diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
diff --git 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(publish / skip := true).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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,3 +18,5 @@ project/plugins/project/ @@
     local.sbt
     secret/
+    .metals/
+    .bloop/