diff --git a/.travis.yml b/.travis.yml index 9a1c7fd..f4ad59b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ scala: - 2.12.8 jdk: - - oraclejdk8 + - openjdk8 before_cache: - find $HOME/.sbt -name '*.lock' -delete diff --git a/project/plugins.sbt b/project/plugins.sbt index 63a225c..ffdc658 100644 --- a/project/plugins.sbt +++ b/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+16-0f6d7799") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index 08e93dc..bb02ff0 100644 --- a/project/project/plugins.sbt +++ b/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") 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)