diff --git a/.scalafmt.conf b/.scalafmt.conf index e661d6c..f216dbf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1 +1,2 @@ +version = "1.5.1" maxColumn = 120 \ No newline at end of file diff --git a/project/coursier.sbt b/project/coursier.sbt new file mode 100644 index 0000000..3a2d48e --- /dev/null +++ b/project/coursier.sbt @@ -0,0 +1 @@ +addSbtCoursier diff --git a/project/plugins.sbt b/project/plugins.sbt index 0158289..4559fc4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,17 +1,15 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+14-76cb6848") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") +addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1") + addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27") addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "3.0.0") - -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+16-0f6d7799") - -addSbtCoursier 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)