Skip to content

Upgrade template #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jun 20, 2019
Merged

Upgrade template #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1f55938
Upgrade Coursier
Atry Apr 2, 2019
29a78a3
Upgrade sbt-best-practice
Atry Apr 5, 2019
8e7b482
Update plugins.sbt
Atry Apr 9, 2019
64cca2e
Update sbt-best-practice
Atry Apr 10, 2019
d2a4120
Update sbt-best-practice
Atry Apr 10, 2019
81cf5b6
Update sbt-best-practice
Atry Apr 10, 2019
76f6cd8
Don't create secret project unless GITHUB_PERSONAL_ACCESS_TOKEN is set
Atry Apr 11, 2019
a851680
Set Scala version
Atry Apr 28, 2019
a7f8bd7
Upgrade sbt-dynver
Atry May 6, 2019
ed166ae
Upgrade sbt-coursier
Atry May 7, 2019
90a2eb6
Switch CI to OpenJDK
Atry May 20, 2019
b78111e
Upgrade sbt-best-practice
Atry Jun 12, 2019
079e71e
Merge branch 'master' into template
Atry Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ scala:
- 2.12.8

jdk:
- oraclejdk8
- openjdk8

before_cache:
- find $HOME/.sbt -name '*.lock' -delete
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
2 changes: 1 addition & 1 deletion project/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M11")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3")
33 changes: 18 additions & 15 deletions secret.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)