Skip to content

Commit

Permalink
Merge branch 'master' into update/scala3-library-3.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
tototoshi authored Apr 25, 2024
2 parents b2ae7d6 + 0938713 commit cdf2927
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.15"
version = "3.7.17"
runner.dialect = scala213
preset = default
maxColumn = 120
Expand Down
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
val flywayPlayVersion = "9.0.0"

val scalaVersion_2_13 = "2.13.12"
val scalaVersion_2_13 = "2.13.13"
val scalaVersion_3 = "3.3.3"

val flywayVersion = "9.16.3"
val scalikejdbcVersion = "4.1.0"
val scalikejdbcVersion = "4.2.1"

val scalatest = "org.scalatest" %% "scalatest" % "3.2.17" % "test"
val scalatest = "org.scalatest" %% "scalatest" % "3.2.18" % "test"

lazy val commonSettings = Seq(
organization := "org.flywaydb",
Expand Down Expand Up @@ -35,7 +35,6 @@ lazy val plugin = project
.settings(
name := "flyway-play",
version := flywayPlayVersion,
resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/",
libraryDependencies ++= Seq(
"org.playframework" %% "play" % play.core.PlayVersion.current % "provided",
"org.playframework" %% "play-test" % play.core.PlayVersion.current % "test"
Expand All @@ -61,7 +60,7 @@ lazy val playapp = project
guice,
"com.h2database" % "h2" % "2.2.224",
"postgresql" % "postgresql" % "9.1-901-1.jdbc4",
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.3",
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.4",
"org.playframework" %% "play-test" % play.core.PlayVersion.current % "test"
excludeAll ExclusionRule(organization = "org.specs2"),
"org.scalikejdbc" %% "scalikejdbc" % scalikejdbcVersion % "test",
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.7
sbt.version=1.9.9
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.0")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.2")

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

scalacOptions ++= Seq("-deprecation", "-unchecked", "-language:_")

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 cdf2927

Please sign in to comment.