Merge branch 'template' of github.com:ThoughtWorksInc/scala-project-template into HEAD

# Conflicts:
#	project/build.properties
#	project/plugins.sbt

Author: Atry

.gitignore

@@ -1,2 +1,3 @@
 target/
 local.sbt
+secret/

.scalafmt.conf

@@ -1 +1,2 @@
+version = "1.5.1"
 maxColumn = 120

.travis.yml

@@ -18,16 +18,16 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot/
+    - $HOME/.coursier/
 
-script:
-  - sbt +test
+before_script:
 
 before_deploy:
 
 deploy:
-  skip_cleanup: true
-  provider: script
-  script: sbt "release with-defaults"
-  on:
-    condition: -e ./deploy.sbt
-    all_branches: true
+  - provider: script
+    script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease
+    skip_cleanup: true
+    on:
+      all_branches: true
+      condition: $GITHUB_PERSONAL_ACCESS_TOKEN

deploy.sbt.disabled

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.2.8

project/build.properties

@@ -0,0 +1 @@
+addSbtCoursier

project/coursier.sbt

@@ -1,5 +1,16 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "1.6.0")
+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")
+
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
+
+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("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "latest.release")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
+

project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-2")

project/project/plugins.sbt

@@ -0,0 +1,16 @@
+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()
+  }
+  secretDirectory
+}