diff --git a/dynver-dash-separator.sbt b/dynver-dash-separator.sbt deleted file mode 100644 index 7fd7b2d..0000000 --- a/dynver-dash-separator.sbt +++ /dev/null @@ -1,2 +0,0 @@ -// Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14 -ThisBuild / dynverSeparator := "-" diff --git a/project/plugins.sbt b/project/plugins.sbt index 54640df..994ecd6 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") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index 08e93dc..76801d0 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-M13-4") 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)