Skip to content

Commit 45654c5

Browse files
authored
Merge pull request #14 from ThoughtWorksInc/template
Update template
2 parents 039472d + 9b7356d commit 45654c5

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

dynver-dash-separator.sbt

Lines changed: 0 additions & 2 deletions
This file was deleted.

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")
1+
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf")
22

33
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
44

project/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M11")
1+
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-4")

secret.sbt

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
lazy val secret = project.settings(publishArtifact := false).in {
2-
val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
3-
for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) {
4-
IO.delete(secretDirectory)
5-
org.eclipse.jgit.api.Git
6-
.cloneRepository()
7-
.setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git")
8-
.setDirectory(secretDirectory)
9-
.setCredentialsProvider(
10-
new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "")
11-
)
12-
.call()
13-
.close()
1+
lazy val secret = {
2+
for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) yield {
3+
val secret = project.settings(publishArtifact := false).in {
4+
val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
5+
IO.delete(secretDirectory)
6+
org.eclipse.jgit.api.Git
7+
.cloneRepository()
8+
.setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git")
9+
.setDirectory(secretDirectory)
10+
.setCredentialsProvider(
11+
new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "")
12+
)
13+
.call()
14+
.close()
15+
secretDirectory
16+
}
17+
secret
1418
}
15-
secretDirectory
16-
}
19+
}.getOrElse(null)

0 commit comments

Comments
 (0)