Skip to content

[8.x] Patch updates #540

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

Merged
mkurz merged 4 commits into from
Jun 3, 2025
Merged

[8.x] Patch updates #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
724140b
[8.x] scala3-library 3.3.6 (was 3.3.5)
scala-steward Jun 1, 2025
a970e49
[8.x] scalafmt-core 3.9.7 (was 3.9.5)
scala-steward Jun 1, 2025
e8f7354
Reformat with scalafmt 3.9.7
scala-steward Jun 1, 2025
942dfbd
Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs
scala-steward Jun 1, 2025
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
7fe92e05b8508927343db11bd4c6bbbd723253c1
# Enable Java formatter
367b1e5662a20cda35df21d715bd76d1bf4d2324

# Scala Steward: Reformat with scalafmt 3.9.7
e8f735466a0ac14497b13b468991b86377f5763f
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im
trailingCommas = preserve
newlines.afterCurlyLambda = preserve
runner.dialect = scala212source3
version = 3.9.5
version = 3.9.7
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def enhanceEbeanClasses(
// Ebean (really hacky sorry)
val cp = classpath.map(_.data.toURI.toURL).toArray :+ classDirectory.toURI.toURL
val cl = new java.net.URLClassLoader(cp)
val t = cl
val t = cl
.loadClass("io.ebean.enhance.Transformer")
.getConstructor(classOf[ClassLoader], classOf[String])
.newInstance(cl, "debug=0")
Expand Down
2 changes: 1 addition & 1 deletion docs/.scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im
trailingCommas = preserve
newlines.afterCurlyLambda = preserve
runner.dialect = scala212source3
version = 3.9.5
version = 3.9.7
2 changes: 1 addition & 1 deletion project/Common.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object Common extends AutoPlugin {
licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
// on the web
homepage := Some(url(s"https://github.com/playframework/$repoName")),
scmInfo := Some(
scmInfo := Some(
ScmInfo(
url(s"https://github.com/playframework/$repoName"),
s"scm:git:[email protected]:playframework/$repoName.git"
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object Dependencies {
object ScalaVersions {
val scala212 = "2.12.20"
val scala213 = "2.13.16"
val scala3 = "3.3.5"
val scala3 = "3.3.6"
}

object Versions {
Expand Down
2 changes: 1 addition & 1 deletion sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import scala.util.control.NonFatal
object PlayEbean extends AutoPlugin {

object autoImport {
val playEbeanModels = taskKey[Seq[String]]("The packages that should be searched for ebean models to enhance.")
val playEbeanModels = taskKey[Seq[String]]("The packages that should be searched for ebean models to enhance.")
val playEbeanVersion =
settingKey[String]("The version of Play ebean that should be added to the library dependencies.")
val playEbeanDebugLevel = settingKey[Int](
Expand Down
Loading