diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..7f9023e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.4.3 +00fbffe614313284b5995ad4cccd3295eb82b11e diff --git a/.scalafmt.conf b/.scalafmt.conf index c831b3a..b3186de 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,7 +1,7 @@ # initial version taken over from alpakka # https://akka.io/blog/2019/09/09/akka-family-builds -version = 3.4.1 +version = 3.4.3 runner.dialect = "scala213" style = defaultWithAlign diff --git a/build.sbt b/build.sbt index 68f0132..d37de38 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ val dockerTestkitVersion = "0.11.0" val scala2_12 = "2.12.17" val scala2_13 = "2.13.10" -scalaVersion := scala2_13 +scalaVersion := scala2_13 crossScalaVersions := Seq(scala2_12, scala2_13) releaseCrossBuild := true @@ -46,16 +46,16 @@ lazy val root = (project in file(".")) "com.typesafe.play" %% "play-json" % playJsonVersion, "com.typesafe.play" %% "play-ws-standalone" % playWsVersion, "com.typesafe.play" %% "play-ws-standalone-json" % playWsVersion, - //"com.typesafe.scala-logging" %% "scala-logging" % "3.1.0", + // "com.typesafe.scala-logging" %% "scala-logging" % "3.1.0", "org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "jcl-over-slf4j" % slf4jVersion, // TEST "ch.qos.logback" % "logback-classic" % logbackVersion % TestAndIntegrationTest, "org.specs2" %% "specs2-core" % specs2Version % TestAndIntegrationTest, "org.specs2" %% "specs2-junit" % specs2Version % TestAndIntegrationTest, - //"com.typesafe.play" %% "play-ahc-ws" % playVersion % TestAndIntegrationTest, // neede for play-mockws - "com.typesafe.play" %% "play-ahc-ws-standalone" % playWsVersion % TestAndIntegrationTest, - "com.whisk" %% "docker-testkit-core" % dockerTestkitVersion % TestAndIntegrationTest excludeAll (nettyExclusions: _*) + // "com.typesafe.play" %% "play-ahc-ws" % playVersion % TestAndIntegrationTest, // neede for play-mockws + "com.typesafe.play" %% "play-ahc-ws-standalone" % playWsVersion % TestAndIntegrationTest, + "com.whisk" %% "docker-testkit-core" % dockerTestkitVersion % TestAndIntegrationTest excludeAll (nettyExclusions: _*) ).map(_.excludeAll(libraryExclusions: _*)) ) .configs(IntegrationTest) diff --git a/project/plugins.sbt b/project/plugins.sbt index 45547ce..c07722f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,5 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") diff --git a/src/it/scala/io/waylay/influxdb/IntegrationSpec.scala b/src/it/scala/io/waylay/influxdb/IntegrationSpec.scala index 022e804..b41f0aa 100644 --- a/src/it/scala/io/waylay/influxdb/IntegrationSpec.scala +++ b/src/it/scala/io/waylay/influxdb/IntegrationSpec.scala @@ -50,7 +50,7 @@ trait IntegrationSpec extends BeforeAfterAllStopOnError { implicit val actorSystem: ActorSystem = ActorSystem("test", ConfigFactory.load(classloader), classloader) implicit val materializer: ActorMaterializer = ActorMaterializer() lazy val mappedInfluxPort: Int = influxdbContainer.mappedPort(InfluxDB.DEFAULT_PORT) - val host = "localhost" //state.docker.host + val host = "localhost" // state.docker.host val wsClient: StandaloneAhcWSClient = StandaloneAhcWSClient() // Do we have a around available that makes this more robust? diff --git a/src/test/scala/io/waylay/influxdb/WriteProtocolSpec.scala b/src/test/scala/io/waylay/influxdb/WriteProtocolSpec.scala index b5a5679..e5d2e64 100644 --- a/src/test/scala/io/waylay/influxdb/WriteProtocolSpec.scala +++ b/src/test/scala/io/waylay/influxdb/WriteProtocolSpec.scala @@ -39,7 +39,7 @@ class WriteProtocolSpec extends Specification { "write double points with at least single decimal" in { val myValue = 21d - //println(myValue.toString) // outputs scientific 2.1E-7 + // println(myValue.toString) // outputs scientific 2.1E-7 val dataLines = WriteProtocol.write( TimeUnit.MILLISECONDS, @@ -51,7 +51,7 @@ class WriteProtocolSpec extends Specification { "write double points without scientific if not needed" in { val myValue = 0.21d - //println(myValue.toString) // outputs scientific 2.1E-7 + // println(myValue.toString) // outputs scientific 2.1E-7 val dataLines = WriteProtocol.write( TimeUnit.MILLISECONDS, @@ -63,7 +63,7 @@ class WriteProtocolSpec extends Specification { "write double points with all digits" in { val myValue = 0.21212121d - //println(myValue.toString) // outputs scientific 2.1E-7 + // println(myValue.toString) // outputs scientific 2.1E-7 val dataLines = WriteProtocol.write( TimeUnit.MILLISECONDS, @@ -75,7 +75,7 @@ class WriteProtocolSpec extends Specification { "write double points with scientific notation where needed" in { val myValue = 0.00000021d - //println(myValue.toString) // outputs scientific 2.1E-7 + // println(myValue.toString) // outputs scientific 2.1E-7 val dataLines = WriteProtocol.write( TimeUnit.MILLISECONDS, diff --git a/src/test/scala/io/waylay/influxdb/query/InfluxQueryBuilderSpec.scala b/src/test/scala/io/waylay/influxdb/query/InfluxQueryBuilderSpec.scala index 6be58b5..da04fad 100644 --- a/src/test/scala/io/waylay/influxdb/query/InfluxQueryBuilderSpec.scala +++ b/src/test/scala/io/waylay/influxdb/query/InfluxQueryBuilderSpec.scala @@ -19,7 +19,7 @@ class InfluxQueryBuilderSpec extends Specification { Interval.from(Instant.ofEpochMilli(0)) ) - //println(query.replace("\n", " ")) + // println(query.replace("\n", " ")) query must be equalTo """SELECT "value" |FROM "CO2" @@ -36,7 +36,7 @@ class InfluxQueryBuilderSpec extends Specification { Interval.fromUntil(Instant.ofEpochMilli(0), Instant.ofEpochMilli(1000)) ) - //println(query.replace("\n", " ")) + // println(query.replace("\n", " ")) query must be equalTo """SELECT "value" |FROM "CO2" @@ -48,7 +48,7 @@ class InfluxQueryBuilderSpec extends Specification { "remove empty lines in simple query" in { val query = InfluxQueryBuilder.simpleMultipleMeasurements(Seq("value"), "resource" -> "Living", Seq("CO2")) - //println(query.replace("\n", " ")) + // println(query.replace("\n", " ")) query must be equalTo """SELECT "value" |FROM "CO2" @@ -81,7 +81,7 @@ class InfluxQueryBuilderSpec extends Specification { Interval.relativeToNow(Duration.days(7)) ) - //println(query.replace("\n", " ")) + // println(query.replace("\n", " ")) query must be equalTo """SELECT COUNT(DISTINCT("value")) |FROM "CO2" @@ -98,7 +98,7 @@ class InfluxQueryBuilderSpec extends Specification { Duration.hours(1) ) - //println(query.replace("\n", " ")) + // println(query.replace("\n", " ")) query must be equalTo """SELECT COUNT("value") |FROM "CO2"