Skip to content

Commit

Permalink
Merge branch 'master' into update/slf4j-simple-2.0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
tototoshi authored Feb 25, 2024
2 parents a002d93 + 07de725 commit 0d0c50a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- java: 11
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: ${{matrix.java}}
distribution: adopt
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ lazy val `slick-joda-mapper` = project.in(file("."))
"joda-time" % "joda-time" % "2.12.5" % "provided",
"org.joda" % "joda-convert" % "2.2.3" % "provided",
"com.h2database" % "h2" % "2.2.224" % "test",
"com.dimafeng" %% "testcontainers-scala" % "0.41.0" % "test",
"com.dimafeng" %% "testcontainers-scala" % "0.41.3" % "test",
"com.mysql" % "mysql-connector-j" % "8.2.0" % "test",
"org.postgresql" % "postgresql" % "42.7.1" % "test",
"org.postgresql" % "postgresql" % "42.7.2" % "test",
"org.testcontainers" % "mysql" % testContainerVersion % "test",
"org.testcontainers" % "postgresql" % testContainerVersion % "test",
"org.slf4j" % "slf4j-simple" % "2.0.12" % "test",
"org.scalatest" %% "scalatest" % "3.2.17" % "test",
"org.scalatest" %% "scalatest" % "3.2.18" % "test",
),
libraryDependencies += {
if (scalaBinaryVersion.value == "3") {
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.6
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
scalacOptions += "-deprecation"

addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")

0 comments on commit 0d0c50a

Please sign in to comment.