Skip to content
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

Patch updates #593

Merged
merged 10 commits into from
Aug 13, 2024
Merged

Patch updates #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd987b7
sbt-assembly 2.1.5 (was 2.1.3)
scala-steward Feb 28, 2024
9b9a044
silencer-lib 1.7.16 (was 1.7.14)
scala-steward Feb 28, 2024
1554610
joda-time 2.12.7 (was 2.12.5)
scala-steward Feb 28, 2024
3c33b25
pekko-stream 1.0.2 (was 1.0.1)
scala-steward Feb 28, 2024
7c740b5
postgresql 42.7.2 (was 42.7.1)
scala-steward Feb 28, 2024
a900ea9
scala-library 2.12.19 (was 2.12.18)
scala-steward Feb 28, 2024
6362bb5
scala-library 2.13.13 (was 2.13.12)
scala-steward Feb 28, 2024
4cd289f
sbt 1.9.9 (was 1.9.6)
scala-steward Feb 28, 2024
dba2156
scalafmt-core 3.7.17 (was 3.7.14)
scala-steward Feb 28, 2024
89a3902
Merge branch 'main' into update/patches
cchantep Aug 13, 2024
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: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.14
version = 3.7.17

runner.dialect = Scala213Source3
project.layout = StandardConvention
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ lazy val `anorm-core` = project
ProblemFilters.exclude[IncompatibleResultTypeProblem]("anorm.ColumnNotFound.copy$default$2")
),
libraryDependencies ++= Seq(
"joda-time" % "joda-time" % "2.12.5",
"joda-time" % "joda-time" % "2.12.7",
"org.joda" % "joda-convert" % "2.2.3",
"org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVer.value,
"org.scala-lang.modules" %% "scala-xml" % xmlVer.value % Test,
Expand Down Expand Up @@ -342,7 +342,7 @@ lazy val `anorm-akka` = (project in file("akka"))
)
.dependsOn(`anorm-core`)

lazy val pekkoVer = Def.setting[String]("1.0.1")
lazy val pekkoVer = Def.setting[String]("1.0.2")

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

// ---

lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.1")
lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.2")

val playVer = Def.setting[String] {
if (scalaBinaryVersion.value == "2.13" || scalaBinaryVersion.value == "3") "2.9.2"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>

sbt.version=1.10.1
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")

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

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")

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

Expand Down