From 3dff176652fa7250e8b094d5b0cb3328b8216197 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sun, 19 Nov 2017 13:43:13 -0800 Subject: Setting version to 1.0.5 --- build.sbt | 2 +- project/plugins.sbt | 2 +- .../xyz.driver.sbt/IntegrationTestPackaging.scala | 14 +++++++ src/main/scala/xyz.driver.sbt/SbtSettings.scala | 43 ++++------------------ version.sbt | 2 +- 5 files changed, 24 insertions(+), 39 deletions(-) diff --git a/build.sbt b/build.sbt index 7d8921d..0b0c14d 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ scalaVersion := "2.12.3" publishMavenStyle := true -addSbtPlugin("com.lucidchart" %% "sbt-scalafmt" % "1.10") +addSbtPlugin("com.lucidchart" %% "sbt-scalafmt" % "1.14") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") // Launch and deploy/release plugins diff --git a/project/plugins.sbt b/project/plugins.sbt index 6faa230..babd6f9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ // Code style plugins addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") -addSbtPlugin("com.lucidchart" %% "sbt-scalafmt" % "1.10") +addSbtPlugin("com.lucidchart" %% "sbt-scalafmt" % "1.14") // Launch and deploy/release plugins addSbtPlugin("io.spray" %% "sbt-revolver" % "0.9.0") diff --git a/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala b/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala index 4a6b4be..7f0c557 100644 --- a/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala +++ b/src/main/scala/xyz.driver.sbt/IntegrationTestPackaging.scala @@ -4,6 +4,7 @@ import java.nio.file._ import scala.collection.JavaConverters._ +import com.lucidchart.sbt.scalafmt.ScalafmtCorePlugin.autoImport._ import com.typesafe.sbt.packager._ import com.typesafe.sbt.packager.Keys._ import com.typesafe.sbt.packager.docker._ @@ -38,8 +39,21 @@ object IntegrationTestPackaging extends AutoPlugin { ivyConfigurations := overrideConfigs(IntegrationTest)(ivyConfigurations.value) ) + private def formatSettings = + inConfig(IntegrationTest)(scalafmtSettings) ++ + Seq( + scalafmt in Test := { + (scalafmt in Test).dependsOn(scalafmt in IntegrationTest).value + }, + // test:scalafmt::test -> tests scalafmt format in src/test + src/it + test in scalafmt in Test := { + (test in scalafmt in Test).dependsOn(test in scalafmt in IntegrationTest).value + } + ) + override def projectSettings = configurationSettings ++ + formatSettings ++ Seq( mappings in Universal ++= { val cp: Seq[(File, String)] = (dependencyClasspath in IntegrationTest).value diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 3ebd504..cf05df8 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -18,6 +18,7 @@ import sbtrelease.ReleasePlugin.autoImport.ReleaseKeys._ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._ import sbtrelease.ReleasePlugin.autoImport._ import sbtrelease.{Version, _} +import IntegrationTestPackaging.autoImport.IntegrationTest // we hide the existing definition for setReleaseVersion to replace it with our own import sbtrelease.ReleaseStateTransformations.{setReleaseVersion => recordReleaseVersion, inquireVersions => _} @@ -35,48 +36,23 @@ object SbtSettings extends AutoPlugin { val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("scalafmt.conf") val formatConfFile = file(".scalafmt.conf") IO.write(formatConfFile, IO.readBytes(scalafmtConfStream)) - Seq(formatConfFile) + formatConfFile } Seq( - scalafmtVersion := "1.3.0", - resourceGenerators in Compile += generateScalafmtConfTask.taskValue, - // it:scalafmt -> runs scalafmt in src/it - scalafmt in IntegrationTest := { - // Explicit dependency to generating .scalafmt.conf file, otherwise there is no guarantee on execution order - (scalafmt in IntegrationTest).dependsOn(generateScalafmtConfTask).value - }, - // test:scalafmt -> runs scalafmt in src/test + src/it - scalafmt in Test := { - // By transitive dependency Test depends on generateScalafmtConfTask. No need to explicitly add it here. - (scalafmt in Test).dependsOn(scalafmt in IntegrationTest).value - }, - // scalafmt -> runs scalafmt in src/main + src/test + src/it + scalafmtConfig := generateScalafmtConfTask.value, scalafmt in Compile := { - // By transitive dependency Compile depends on generateScalafmtConfTask. No need to explicitly add it here. (scalafmt in Compile).dependsOn(scalafmt in Test).value }, - // it:scalafmt::test -> tests scalafmt format in src/it - test in scalafmt in IntegrationTest := { - // Explicit dependency to generating .scalafmt.conf file, otherwise there is no guarantee on execution order - (test in scalafmt in IntegrationTest).dependsOn(generateScalafmtConfTask).value - }, - // test:scalafmt::test -> tests scalafmt format in src/test + src/it - test in scalafmt in Test := { - // By transitive dependency Test depends on generateScalafmtConfTask. No need to explicitly add it here. - (test in scalafmt in Test).dependsOn(test in scalafmt in IntegrationTest).value - }, // scalafmt::test -> tests scalafmt format in src/main + src/test (added behavior) test in scalafmt in Compile := { - // By transitive dependency Compile depends on generateScalafmtConfTask. No need to explicitly add it here. (test in scalafmt in Compile).dependsOn(test in scalafmt in Test).value - }, test in Test := { (test in scalafmt in Compile).value (test in Test).value } - ) ++ inConfig(IntegrationTest)(scalafmtSettings) + ) } lazy val testScalastyle = taskKey[Unit]("testScalastyle") @@ -280,8 +256,8 @@ object SbtSettings extends AutoPlugin { .settings( // for assembly plugin test in assembly := {}, assemblyMergeStrategy in assembly := { - case PathList("org", "slf4j", "impl", xs @ _ *) => MergeStrategy.first - case "logback.xml" => MergeStrategy.first + case PathList("org", "slf4j", "impl", xs @ _*) => MergeStrategy.first + case "logback.xml" => MergeStrategy.first case strategy: String => val oldStrategy = (assemblyMergeStrategy in assembly).value oldStrategy(strategy) @@ -343,12 +319,7 @@ object SbtSettings extends AutoPlugin { val allExposedPorts = exposedPorts ++ Seq(JMX_PORT) - dockerConfiguration(imageName, - repositoryName, - allExposedPorts, - baseImage, - dockerCommands, - aggregateSubprojects) + dockerConfiguration(imageName, repositoryName, allExposedPorts, baseImage, dockerCommands, aggregateSubprojects) .settings(NativePackagerKeys.bashScriptExtraDefines += importTrustStoreCommand) .settings(NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote"""") .settings( diff --git a/version.sbt b/version.sbt index 47af175..cd82e21 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.0.5-SNAPSHOT" +version in ThisBuild := "1.0.5" -- cgit v1.2.3