Merge branch 'template' of https://github.com/ThoughtWorksInc/scala-p…

…roject-template into template
ThoughtWorksInc · Oct 4, 2019 · f84bf0e · f84bf0e
2 parents cb2d133 + e125d0b
commit f84bf0e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ before_deploy:
 
 deploy:
   - provider: script
-    script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease
+    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
     skip_cleanup: true
     on:
       all_branches: true

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.0
diff --git a/project/coursier.sbt b/project/coursier.sbt
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf")
+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
 
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 

diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
diff --git a/secret.sbt b/secret.sbt
@@ -1,6 +1,6 @@
 lazy val secret = {
   for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) yield {
-    val secret = project.settings(publishArtifact := false).in {
+    val secret = project.settings(publish / skip := true).in {
       val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
       IO.delete(secretDirectory)
       org.eclipse.jgit.api.Git