Merge pull request #26 from Atry/template

Upgrade template

Author: Atry

.travis.yml

@@ -7,8 +7,11 @@ addons:
 
 language: scala
 
+scala:
+  - 2.12.8
+
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 before_cache:
   - find $HOME/.sbt -name '*.lock' -delete

project/plugins.sbt

@@ -1,8 +1,8 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")
+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+14-76cb6848")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 

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-M14-3")

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)