Skip to content

Update scalafmt-core to 3.4.3 #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 26, 2022
Merged

Update scalafmt-core to 3.4.3 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d43d7ce
Update scalafmt-core to 3.4.3
scala-steward Oct 25, 2022
00fbffe
Reformat with scalafmt 3.4.3
scala-steward Oct 25, 2022
c9d0db2
Add 'Reformat with scalafmt 3.4.3' to .git-blame-ignore-revs
scala-steward Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.4.3
00fbffe614313284b5995ad4cccd3295eb82b11e
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 5 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion src/it/scala/io/waylay/influxdb/IntegrationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
8 changes: 4 additions & 4 deletions src/test/scala/io/waylay/influxdb/WriteProtocolSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions src/test/scala/io/waylay/influxdb/query/InfluxQueryBuilderSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down