Skip to content

Commit

Permalink
Merge pull request #828 from mkurz/slick350-final-53x
Browse files Browse the repository at this point in the history
[5.3.x] slick 3.5.0 final release + other dependency upgrades
  • Loading branch information
mkurz authored Mar 8, 2024
2 parents 71206f5 + b3535f0 commit c243f4f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
lazy val commonSettings = Seq(
// Work around https://issues.scala-lang.org/browse/SI-9311
scalacOptions ~= (_.filterNot(_ == "-Xfatal-warnings")),
scalaVersion := "2.13.12",
crossScalaVersions := Seq("2.13.12", "3.3.1"),
scalaVersion := "2.13.13",
crossScalaVersions := Seq("2.13.13", "3.3.3"),
pomExtra := scala.xml.NodeSeq.Empty, // Can be removed when dropping interplay
developers += Developer(
"playframework",
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Dependencies {
object Version {
val play = _root_.play.core.PlayVersion.current

val slick = "3.5.0-RC1"
val slick = "3.5.0"
val h2 = "2.2.224"
}

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.8
sbt.version=1.9.9
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"), // used by deploy nightlies, which publish here & use -Dplay.version
)

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.props.getOrElse("play.version", "2.9.1"))
addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.1"))
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.props.getOrElse("play.version", "2.9.2"))
addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.2"))
addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("3.1.7"))

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

0 comments on commit c243f4f

Please sign in to comment.