Skip to content

Commit 7e241e0

Browse files
authored
Merge pull request #242 from Atry/template
Update template
2 parents e1f944a + 9eb15c5 commit 7e241e0

File tree

7 files changed

+30
-22
lines changed

7 files changed

+30
-22
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ project/plugins/project/
3030
# Files created for deployment
3131
local.sbt
3232
secret/
33+
.metals/
34+
.bloop/

.gitpod.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
image: igeolise/scalajs-test-runner:latest
2+
vscode:
3+
extensions:
4+
- [email protected]:wQBBM+lKILHBqOqlqW60xA==
5+
- [email protected]:pVVu91DEAijx+sPKu8fgHA==

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ before_deploy:
3535

3636
deploy:
3737
- provider: script
38-
script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease
38+
script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease
3939
skip_cleanup: true
4040
on:
4141
all_branches: true

project/coursier.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.31")
22

33
addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0")
44

5-
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf")
5+
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1")
66

7-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.6")
7+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
88

9-
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+16-0f6d7799")
9+
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
1010

1111
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
1212

1313
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
1414

15-
addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1")
15+
addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0")

project/project/plugins.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

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(publish / skip := true).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)