Skip to content

Commit

Permalink
Patch updates (#634)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
scala-steward authored Feb 7, 2025
1 parent 36e1977 commit cbde028
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@

# Scala Steward: Reformat with scalafmt 3.8.3
55a3ae1ab9dfbdf9fcc7a0bb9ae8ee603b72ab3a

# Scala Steward: Reformat with scalafmt 3.8.6
5300111f7f95129b0bd1a845132ca4017939e112
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.6

runner.dialect = Scala213Source3
project.layout = StandardConvention
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ lazy val `anorm-core` = project
}

Seq(
"joda-time" % "joda-time" % "2.13.0",
"joda-time" % "joda-time" % "2.13.1",
"org.joda" % "joda-convert" % "2.2.4",
"org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVer.value,
"org.scala-lang.modules" %% "scala-xml" % xmlVer.value % Test,
Expand Down Expand Up @@ -352,7 +352,7 @@ lazy val `anorm-akka` = (project in file("akka"))
)
.dependsOn(`anorm-core`)

lazy val pekkoVer = Def.setting[String]("1.1.2")
lazy val pekkoVer = Def.setting[String]("1.1.3")

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

// ---

lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.4")
lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.5")

val playVer = Def.setting[String] {
if (scalaBinaryVersion.value == "2.13" || scalaBinaryVersion.value == "3") "2.9.2"
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/AnormSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class AnormSpec
val ex: Boolean = SQL"""insert into test1(id, foo, bar)
values (${10L}, ${"Hello"}, ${20})""".execute()

(ex.aka("update executed") must beFalse) /*not query*/.and {
(ex.aka("update executed") must beFalse) /*not query*/ .and {
SQL("select * from test1 where id = {id}")
.on(Symbol("id") -> 10L)
.as(RowParser { row =>
Expand Down
2 changes: 1 addition & 1 deletion enumeratum/src/test/scala/EnumColumnSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import anorm.{ AnormException, SQL, SqlParser, TypeDoesNotMatch }
import SqlParser.scalar

final class EnumColumnSpec extends org.specs2.mutable.Specification {
"Enum column" title
"Enum column".title

"Sensitive enum" should {
"be successfully parsed as Column" >> {
Expand Down
2 changes: 1 addition & 1 deletion enumeratum/src/test/scala/EnumToStatement.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import acolyte.jdbc.Implicits._
import anorm._

final class EnumToStatementSpec extends org.specs2.mutable.Specification {
"Enum parameters" title
"Enum parameters".title

"Sensitive enum" should {
"be successfully passed as parameter" >> {
Expand Down
2 changes: 1 addition & 1 deletion enumeratum/src/test/scala/values/ValueEnumColumnSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import anorm.{ AnormException, SQL, SqlParser, TypeDoesNotMatch }
import SqlParser.scalar

final class ValueEnumColumnSpec extends org.specs2.mutable.Specification {
"ValueEnum column" title
"ValueEnum column".title

"ValueEnum" should {
"be successfully parsed as Column" >> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import acolyte.jdbc.Implicits._
import anorm._

final class ValueEnumToStatementSpec extends org.specs2.mutable.Specification {
"ValueEnum parameters" title
"ValueEnum parameters".title

"Sensitive ValueEnum" should {
"successfully passed as parameter" >> {
Expand Down
2 changes: 1 addition & 1 deletion iteratee/src/test/scala/anorm/IterateeSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import anorm._

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

"Play Iteratee" title
"Play Iteratee".title

"Iteratees" should {
"broadcast the streaming result" in {
Expand Down
4 changes: 2 additions & 2 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ object Common extends AutoPlugin {
organization := "org.playframework.anorm",
sonatypeProfileName := "org.playframework",
scalaVersion := "2.12.20",
crossScalaVersions := Seq("2.11.12", scalaVersion.value, "2.13.15", "3.3.4"),
crossScalaVersions := Seq("2.11.12", scalaVersion.value, "2.13.16", "3.3.5"),
Compile / unmanagedSourceDirectories ++= {
val sv = scalaVersion.value

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

if (out exists) out
if (out.exists) out
else {
IO.writer[File](out, "", IO.defaultCharset, false) { w
w.append("""package anorm
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")

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

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

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

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

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

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

Expand Down

0 comments on commit cbde028

Please sign in to comment.