Merge pull request #221 from Atry/template

Update template
ThoughtWorksInc · Mar 27, 2019 · af063f9 · af063f9
2 parents 199595f + 1189a8b
commit af063f9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1 +1,2 @@
+version = "1.5.1"
 maxColumn = 120
diff --git a/build.sbt b/build.sbt
@@ -311,5 +311,3 @@ parallelExecution in Global := {
   VersionNumber(scalaVersion.value).numbers >= Seq(2L, 12L)
 }
 
-dynverSeparator in ThisBuild := "-"
-
diff --git a/dynver-dash-separator.sbt b/dynver-dash-separator.sbt
@@ -0,0 +1,2 @@
+// Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14
+ThisBuild / dynverSeparator := "-"
diff --git a/project/coursier.sbt b/project/coursier.sbt
@@ -0,0 +1 @@
+addSbtCoursier
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,8 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "6.0.0")
+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")
 
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+7-d5e88cd5")
+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")
 
@@ -11,5 +13,3 @@ addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
-
-addSbtCoursier
Original file line number	Diff line number	Diff line change
Expand Up		@@ -311,5 +311,3 @@ parallelExecution in Global := {
		VersionNumber(scalaVersion.value).numbers >= Seq(2L, 12L)
		}

		dynverSeparator in ThisBuild := "-"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14
		ThisBuild / dynverSeparator := "-"