Merge branch 'release/2.0.0'

Author: Travis CI User

.bettercodehub.yml

@@ -0,0 +1,13 @@
+component_depth: 15
+languages:
+  - name: scala
+    production:
+      include:
+        - /src/main/scala/.*
+      exclude:
+        - /src/main/scala/org/scalatest/.*
+    test:
+      include:
+        - /src/sbt-test/.*
+      exclude:
+        - /src/main/scala/.*

.scalafmt.conf

@@ -0,0 +1,21 @@
+version = "2.0.0-RC6"
+
+# change to "always" after support for SBT 0.13 is dropped
+trailingCommas = never
+
+rewrite.rules = [
+  AvoidInfix
+  SortModifiers
+  PreferCurlyFors
+]
+
+# Reorder modifiers according to:
+# https://docs.scala-lang.org/style/declarations.html#modifiers
+rewrite.sortModifiers.order = [
+  "override"
+  "private", "protected"
+  "implicit"
+  "final", "sealed"
+  "abstract"
+  "lazy"
+]

.travis.yml

@@ -8,13 +8,16 @@ language: scala
 # Ubuntu Trusty (https://docs.travis-ci.com/user/reference/trusty/)
 dist: trusty
 
+# https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html#running-versus-compiling
+jdk: openjdk8
+
 jobs:
   include:
-    - name: test
+    - stage: test
       if: (NOT branch =~ /^release\/.*$/)
       # When running scripted tests targeting multiple SBT versions, we must first publish locally for all SBT versions
-      script: sbt "^ publishLocal" "^ scripted"
-    - name: release
+      script: sbt "^ publishLocal" "scripted"
+    - stage: release
       if: (branch =~ /^release\/.*$/)
       env:
         - BINTRAY_USER=daniel-shuy

README.md

@@ -4,15 +4,37 @@ organization := "com.github.daniel-shuy"
 
 name := "sbt-scripted-scalatest"
 
-licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
+licenses := Seq(
+  "Apache License, Version 2.0" -> url(
+    "http://www.apache.org/licenses/LICENSE-2.0.txt"
+  )
+)
+
+homepage := Some(
+  url("https://github.com/daniel-shuy/scripted-scalatest-sbt-plugin")
+)
 
-homepage := Some(url("https://github.com/daniel-shuy/scripted-scalatest-sbt-plugin"))
+scmInfo := Some(
+  ScmInfo(
+    url("https://github.com/daniel-shuy/scripted-scalatest-sbt-plugin"),
+    "[email protected]:daniel-shuy/scripted-scalatest-sbt-plugin.git"
+  )
+)
+
+developers := List(
+  Developer(
+    "daniel-shuy",
+    "Daniel Shuy",
+    "[email protected]",
+    url("https://github.com/daniel-shuy")
+  )
+)
 
 crossSbtVersions := Seq(
   "0.13.17",
-  "1.2.6"
+  "1.3.3"
 )
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.0.0"
+  "org.scalatest" %% "scalatest" % "3.1.0"
 )

build.sbt

@@ -1 +1 @@
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.5")

project/bintray.sbt

@@ -1 +1 @@
-sbt.version = 1.2.6
+sbt.version = 1.3.3

project/build.properties

@@ -1 +1 @@
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.12")

project/release.sbt

@@ -2,6 +2,13 @@ publishMavenStyle := false
 
 bintrayRepository := "sbt-plugins"
 
-bintrayPackageLabels := Seq("sbt", "sbt-plugin", "sbt-test", "scripted", "scripted-plugin", "scalatest")
+bintrayPackageLabels := Seq(
+  "sbt",
+  "sbt-plugin",
+  "sbt-test",
+  "scripted",
+  "scripted-plugin",
+  "scalatest"
+)
 
 bintrayReleaseOnPublish := false

publish.sbt

@@ -2,6 +2,7 @@ import ReleaseTransformations._
 
 releaseIgnoreUntrackedFiles := true
 
+// skip Travis CI build
 releaseCommitMessage := s"[ci skip] ${releaseCommitMessage.value}"
 
 releaseProcess := Seq[ReleaseStep](
@@ -11,7 +12,7 @@ releaseProcess := Seq[ReleaseStep](
   releaseStepCommandAndRemaining("^ test"),
   // When running scripted tests targeting multiple SBT versions, we must first publish locally for all SBT versions
   releaseStepCommandAndRemaining("^ publishLocal"),
-  releaseStepCommandAndRemaining("^ scripted"),
+  releaseStepInputTask(scripted),
   setReleaseVersion,
   commitReleaseVersion,
   // don't tag, leave it to git flow