Skip to content

Commit

Permalink
Upgrade sbt, Scala, Play to latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Mar 11, 2024
1 parent d7d72af commit b3c0eb0
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
java: 17, 11
scala: 2.13.12, 3.3.1
scala: 2.13.13, 3.3.3
cmd: >-
sbt "
+publishLocal;
Expand Down
4 changes: 2 additions & 2 deletions docs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ lazy val docs = project
// No resource directories shuts the ebean agent up about java sources in the classes directory
Test / unmanagedResourceDirectories := Nil,
Test / parallelExecution := false,
scalaVersion := "2.13.12",
crossScalaVersions := Seq("2.13.12", "3.3.1"),
scalaVersion := "2.13.13",
crossScalaVersions := Seq("2.13.13", "3.3.3"),
)
.settings(
Test / javafmt / sourceDirectories ++= (Test / unmanagedSourceDirectories).value,
Expand Down
2 changes: 1 addition & 1 deletion docs/project/build.properties
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.9.8
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion docs/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ lazy val sbtPlayEbean = ProjectRef(Path.fileProperty("user.dir").getParentFile,

resolvers ++= DefaultOptions.resolvers(snapshot = true)

addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.1"))
addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.2"))

addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")

Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import sbt._
object Dependencies {

object ScalaVersions {
val scala212 = "2.12.18"
val scala213 = "2.13.12"
val scala3 = "3.3.1"
val scala212 = "2.12.19"
val scala213 = "2.13.13"
val scala3 = "3.3.3"
}

object Versions {
val play: String = "3.0.1"
val play: String = "3.0.2"
val ebean = "15.0.1"
val typesafeConfig = "1.4.3"
}
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
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.9.8
sbt.version=1.9.9
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ object PlayEbean extends AutoPlugin {
libraryDependencies ++=
Seq(
"org.playframework" %% "play-ebean" % playEbeanVersion.value,
"org.glassfish.jaxb" % "jaxb-runtime" % "4.0.4"
"org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5"
)
)

Expand Down

0 comments on commit b3c0eb0

Please sign in to comment.