Skip to content

Commit cbde028

Browse files
Patch updates (#634)
* sbt-assembly 2.3.1 (was 2.3.0) * joda-time 2.13.1 (was 2.13.0) * pekko-stream 1.1.3 (was 1.1.2) * postgresql 42.7.5 (was 42.7.4) * scala-library 2.13.16 (was 2.13.15) * scala3-compiler 3.3.5 (was 3.3.4) * sbt-scalafmt 2.5.4 (was 2.5.2) * scalafmt-core 3.8.6 (was 3.8.3) * Reformat with scalafmt 3.8.6 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.8.6' to .git-blame-ignore-revs
1 parent 36e1977 commit cbde028

11 files changed

+17
-14
lines changed

.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66

77
# Scala Steward: Reformat with scalafmt 3.8.3
88
55a3ae1ab9dfbdf9fcc7a0bb9ae8ee603b72ab3a
9+
10+
# Scala Steward: Reformat with scalafmt 3.8.6
11+
5300111f7f95129b0bd1a845132ca4017939e112

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.8.3
1+
version = 3.8.6
22

33
runner.dialect = Scala213Source3
44
project.layout = StandardConvention

build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ lazy val `anorm-core` = project
240240
}
241241

242242
Seq(
243-
"joda-time" % "joda-time" % "2.13.0",
243+
"joda-time" % "joda-time" % "2.13.1",
244244
"org.joda" % "joda-convert" % "2.2.4",
245245
"org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVer.value,
246246
"org.scala-lang.modules" %% "scala-xml" % xmlVer.value % Test,
@@ -352,7 +352,7 @@ lazy val `anorm-akka` = (project in file("akka"))
352352
)
353353
.dependsOn(`anorm-core`)
354354

355-
lazy val pekkoVer = Def.setting[String]("1.1.2")
355+
lazy val pekkoVer = Def.setting[String]("1.1.3")
356356

357357
lazy val pekkoEnabled = Def.setting[Boolean] {
358358
val v = scalaBinaryVersion.value
@@ -424,7 +424,7 @@ lazy val `anorm-pekko` = (project in file("pekko"))
424424

425425
// ---
426426

427-
lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.4")
427+
lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.5")
428428

429429
val playVer = Def.setting[String] {
430430
if (scalaBinaryVersion.value == "2.13" || scalaBinaryVersion.value == "3") "2.9.2"

core/src/test/scala/AnormSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class AnormSpec
3131
val ex: Boolean = SQL"""insert into test1(id, foo, bar)
3232
values (${10L}, ${"Hello"}, ${20})""".execute()
3333

34-
(ex.aka("update executed") must beFalse) /*not query*/.and {
34+
(ex.aka("update executed") must beFalse) /*not query*/ .and {
3535
SQL("select * from test1 where id = {id}")
3636
.on(Symbol("id") -> 10L)
3737
.as(RowParser { row =>

enumeratum/src/test/scala/EnumColumnSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import anorm.{ AnormException, SQL, SqlParser, TypeDoesNotMatch }
1515
import SqlParser.scalar
1616

1717
final class EnumColumnSpec extends org.specs2.mutable.Specification {
18-
"Enum column" title
18+
"Enum column".title
1919

2020
"Sensitive enum" should {
2121
"be successfully parsed as Column" >> {

enumeratum/src/test/scala/EnumToStatement.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import acolyte.jdbc.Implicits._
1111
import anorm._
1212

1313
final class EnumToStatementSpec extends org.specs2.mutable.Specification {
14-
"Enum parameters" title
14+
"Enum parameters".title
1515

1616
"Sensitive enum" should {
1717
"be successfully passed as parameter" >> {

enumeratum/src/test/scala/values/ValueEnumColumnSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import anorm.{ AnormException, SQL, SqlParser, TypeDoesNotMatch }
1515
import SqlParser.scalar
1616

1717
final class ValueEnumColumnSpec extends org.specs2.mutable.Specification {
18-
"ValueEnum column" title
18+
"ValueEnum column".title
1919

2020
"ValueEnum" should {
2121
"be successfully parsed as Column" >> {

enumeratum/src/test/scala/values/ValueEnumToParameterSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import acolyte.jdbc.Implicits._
1111
import anorm._
1212

1313
final class ValueEnumToStatementSpec extends org.specs2.mutable.Specification {
14-
"ValueEnum parameters" title
14+
"ValueEnum parameters".title
1515

1616
"Sensitive ValueEnum" should {
1717
"successfully passed as parameter" >> {

iteratee/src/test/scala/anorm/IterateeSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import anorm._
1616

1717
class IterateeSpec(implicit ee: ExecutionEnv) extends org.specs2.mutable.Specification {
1818

19-
"Play Iteratee" title
19+
"Play Iteratee".title
2020

2121
"Iteratees" should {
2222
"broadcast the streaming result" in {

project/Common.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object Common extends AutoPlugin {
2222
organization := "org.playframework.anorm",
2323
sonatypeProfileName := "org.playframework",
2424
scalaVersion := "2.12.20",
25-
crossScalaVersions := Seq("2.11.12", scalaVersion.value, "2.13.15", "3.3.4"),
25+
crossScalaVersions := Seq("2.11.12", scalaVersion.value, "2.13.16", "3.3.5"),
2626
Compile / unmanagedSourceDirectories ++= {
2727
val sv = scalaVersion.value
2828

@@ -146,7 +146,7 @@ object AnormGeneration {
146146
def generateFunctionAdapter(dir: File): File = {
147147
val out = dir / "FunctionAdapter.scala"
148148

149-
if (out exists) out
149+
if (out.exists) out
150150
else {
151151
IO.writer[File](out, "", IO.defaultCharset, false) { w
152152
w.append("""package anorm

project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
88

99
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
1010

11-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
11+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
1212

1313
addSbtPlugin("cchantep" % "sbt-scaladoc-compiler" % "0.2")
1414

1515
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
1616

17-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
17+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
1818

1919
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
2020

0 commit comments

Comments
 (0)