Merge pull request #73 from ThoughtWorksInc/template

Update template

.travis.yml

@@ -13,7 +13,7 @@ scala:
   - "2.12.8"
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 before_cache:
   - find $HOME/.sbt -name '*.lock' -delete
@@ -31,7 +31,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

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.2

project/plugins.sbt

@@ -1,12 +1,12 @@
-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("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.30")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
 
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+16-0f6d7799")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 

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)