diff options
Diffstat (limited to 'src/main/scala')
-rw-r--r-- | src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala | 4 | ||||
-rw-r--r-- | src/main/scala/xyz.driver.sbt/LibraryPlugin.scala (renamed from src/main/scala/xyz.driver.sbt/Library.scala) | 4 | ||||
-rw-r--r-- | src/main/scala/xyz.driver.sbt/LintPlugin.scala (renamed from src/main/scala/xyz.driver.sbt/Linting.scala) | 14 | ||||
-rw-r--r-- | src/main/scala/xyz.driver.sbt/ServicePlugin.scala (renamed from src/main/scala/xyz.driver.sbt/Service.scala) | 4 |
4 files changed, 14 insertions, 12 deletions
diff --git a/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala b/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala index c89dcec..d81edd6 100644 --- a/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala +++ b/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala @@ -12,7 +12,7 @@ import scala.collection.JavaConverters._ object IntegrationTestPackaging extends AutoPlugin { - override def requires = Service + override def requires = ServicePlugin override def trigger = allRequirements object autoImport { @@ -76,7 +76,7 @@ object IntegrationTestPackaging extends AutoPlugin { cp ++ tests ++ Seq(scriptFile -> s"bin/${normalizedName.value}-it") }, - Service.autoImport.customCommands := List( + ServicePlugin.autoImport.customCommands := List( "mkdir -p test", s"ln -s ${(defaultLinuxInstallLocation in Docker).value}/bin/${normalizedName.value}-it /test/run_integration_test.sh" ) diff --git a/src/main/scala/xyz.driver.sbt/Library.scala b/src/main/scala/xyz.driver.sbt/LibraryPlugin.scala index 4e63f90..501f2fb 100644 --- a/src/main/scala/xyz.driver.sbt/Library.scala +++ b/src/main/scala/xyz.driver.sbt/LibraryPlugin.scala @@ -8,7 +8,7 @@ import sbt._ import sbt.plugins.JvmPlugin /** Common settings for a library, Driver style. */ -object Library extends AutoPlugin { +object LibraryPlugin extends AutoPlugin { override def requires = JvmPlugin @@ -40,7 +40,7 @@ object Library extends AutoPlugin { ) } - override def buildSettings = versionSettings ++ Seq( + override def buildSettings: Seq[sbt.Setting[_]] = versionSettings ++ Seq( skip in publish := true ) diff --git a/src/main/scala/xyz.driver.sbt/Linting.scala b/src/main/scala/xyz.driver.sbt/LintPlugin.scala index 4afca9a..7d882cb 100644 --- a/src/main/scala/xyz.driver.sbt/Linting.scala +++ b/src/main/scala/xyz.driver.sbt/LintPlugin.scala @@ -5,12 +5,12 @@ import org.scalafmt.sbt.ScalafmtPlugin.autoImport._ import org.scalastyle.sbt.ScalastylePlugin import org.scalastyle.sbt.ScalastylePlugin.autoImport.{scalastyle, scalastyleConfig} import sbt.Keys._ -import sbt._ +import sbt.{Def, _} import scala.collection.JavaConverters._ /** Enforces common formatting and catches compiler warnings. */ -object Linting extends AutoPlugin { +object LintPlugin extends AutoPlugin { override def requires = ScalafmtPlugin && ScalastylePlugin override def trigger = allRequirements @@ -82,15 +82,17 @@ object Linting extends AutoPlugin { log.error(s"[fatal warning] $file:$line:$col $msg\n$desc") } } - if (!deprecationsOnly) + if (!deprecationsOnly) { throw new MessageOnlyException( - "Fatal warnings: some warnings other than deprecations were found. Disable " + - "the `Linting` plugin to ignore fatal warnings.") + "Fatal warnings: some warnings other than deprecations were found. " + + "This failure can be ignored by removing the lint plugin from the sbt project. " + + "(E.g. add `disablePlugins(LintPlugin)` to build.sbt).") + } compiled } ) - lazy val lintSettings = formatSettings ++ scalastyleSettings ++ scalacSettings + lazy val lintSettings: Seq[Def.Setting[_]] = formatSettings ++ scalastyleSettings ++ scalacSettings override def projectSettings: Seq[Def.Setting[_]] = inConfig(Compile)(lintSettings) ++ inConfig(Test)(lintSettings) diff --git a/src/main/scala/xyz.driver.sbt/Service.scala b/src/main/scala/xyz.driver.sbt/ServicePlugin.scala index 5a9fd52..82e20de 100644 --- a/src/main/scala/xyz.driver.sbt/Service.scala +++ b/src/main/scala/xyz.driver.sbt/ServicePlugin.scala @@ -13,7 +13,7 @@ import sbtbuildinfo.BuildInfoPlugin import sbtbuildinfo.BuildInfoPlugin.autoImport._ /** Common settings to a service. */ -object Service extends AutoPlugin { +object ServicePlugin extends AutoPlugin { override def requires = BuildInfoPlugin && DockerPlugin && JavaAppPackaging @@ -68,7 +68,7 @@ object Service extends AutoPlugin { ) override def projectSettings: Seq[Def.Setting[_]] = - Library.repositorySettings ++ buildInfoSettings ++ dockerSettings ++ Seq( + LibraryPlugin.repositorySettings ++ buildInfoSettings ++ dockerSettings ++ Seq( organization := "xyz.driver", crossScalaVersions := List("2.12.6"), scalaVersion := crossScalaVersions.value.last, |