diff --git a/.scalafmt.conf b/.scalafmt.conf index 9ff187f..23692cc 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,5 @@ +version = 1.5.1 + maxColumn = 120 docstrings = JavaDoc assumeStandardLibraryStripMargin = true diff --git a/build.sbt b/build.sbt index d129129..ff2092b 100644 --- a/build.sbt +++ b/build.sbt @@ -13,11 +13,11 @@ crossSbtVersions := List("1.1.0") organization := "com.lightbend.paradox" name := "sbt-paradox-project-info" -addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.4.3") +addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.4.3") libraryDependencies ++= Seq( - "com.typesafe" % "config" % "1.3.3", - "org.scalatest" %% "scalatest" % "3.0.8" % Test, // ApacheV2 + "com.typesafe" % "config" % "1.3.3", + "org.scalatest" %% "scalatest" % "3.0.8" % Test // ApacheV2 ) licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")) @@ -35,7 +35,7 @@ organizationName := "Lightbend Inc." startYear := Some(2018) // no API docs -sources in (Compile, doc) := Seq.empty +sources in (Compile, doc) := Seq.empty publishArtifact in (Compile, packageDoc) := false bintrayOrganization := Some("sbt") diff --git a/project/build.properties b/project/build.properties index 6adcdc7..797e7cc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.3 +sbt.version=1.3.10 diff --git a/project/plugins.sbt b/project/plugins.sbt index b0fd1c1..9fad0b1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.1.0") -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0") -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2") diff --git a/src/main/scala/com/lightbend/paradox/projectinfo/model.scala b/src/main/scala/com/lightbend/paradox/projectinfo/model.scala index aafe067..e459e0b 100644 --- a/src/main/scala/com/lightbend/paradox/projectinfo/model.scala +++ b/src/main/scala/com/lightbend/paradox/projectinfo/model.scala @@ -36,11 +36,11 @@ case class SbtValues(artifact: String, trait ReadinessLevel { def name: String } object ReadinessLevel { private def glossary(anchor: String, label: String): String = - s"""$label""".stripMargin + s"""$label""".stripMargin case object Supported extends ReadinessLevel { val name = - s"""${glossary("supported", "Supported")}, Lightbend Platform Subscription provides support""" + s"""${glossary("supported", "Supported")}, Lightbend Subscription provides support""" } case object Certified extends ReadinessLevel { val name = diff --git a/src/sbt-test/project-info/explicit-version/expected/index.html b/src/sbt-test/project-info/explicit-version/expected/index.html index 8b2f3b6..029c62e 100644 --- a/src/sbt-test/project-info/explicit-version/expected/index.html +++ b/src/sbt-test/project-info/explicit-version/expected/index.html @@ -11,7 +11,7 @@ JPMS module namealpakka.core License
Apache-2.0
- Readiness level
Supported, Lightbend Platform Subscription provides support
+ Readiness level
Supported, Lightbend Subscription provides support
Since 0.22, 2018-11-22
Home pagehttps://github.com/lightbend/sbt-paradox-project-info diff --git a/src/sbt-test/project-info/happy-path/expected/index.html b/src/sbt-test/project-info/happy-path/expected/index.html index b556753..3b00e64 100644 --- a/src/sbt-test/project-info/happy-path/expected/index.html +++ b/src/sbt-test/project-info/happy-path/expected/index.html @@ -11,7 +11,7 @@ JPMS module namealpakka.core License
Apache-2.0
- Readiness level
Supported, Lightbend Platform Subscription provides support
+ Readiness level
Supported, Lightbend Subscription provides support
Since 0.22, 2018-11-22
Home pagehttps://github.com/lightbend/sbt-paradox-project-info @@ -38,7 +38,7 @@ JPMS module namealpakka.core.testkit License
Apache-2.0
- Readiness level
Incubating
+ Readiness level
Incubating
Since 0.16, 2018-11-22
Home pagehttps://github.com/lightbend/sbt-paradox-project-info