playframework / play-slick

Slick Plugin for Play
Apache License 2.0
802 stars 283 forks source link

[5.3.x] Patch updates (backport #851) by @scala-steward #852

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 4 months ago

About this PR

Updates:

Usage

βœ… Please merge!

I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.

If you have any feedback, just mention me in the comments below.

Configure Scala Steward for your repository with a .scala-steward.conf file.

Have a fantastic day writing Scala!

πŸ” Files still referring to the old version numbers The following files still refer to the old version numbers. You might want to review and update them manually. ``` README.md ```
βš™ Adjust future updates Add these to your `.scala-steward.conf` file to ignore future updates of these dependencies: ``` updates.ignore = [ { groupId = "com.typesafe.slick", artifactId = "slick" }, { groupId = "com.typesafe.slick", artifactId = "slick-hikaricp" }, { groupId = "org.scala-lang", artifactId = "scala-library" }, { groupId = "org.scalameta", artifactId = "scalafmt-core" } ] ``` Or, add these to slow down future updates of these dependencies: ``` dependencyOverrides = [ { pullRequests = { frequency = "30 days" }, dependency = { groupId = "com.typesafe.slick", artifactId = "slick" } }, { pullRequests = { frequency = "30 days" }, dependency = { groupId = "com.typesafe.slick", artifactId = "slick-hikaricp" } }, { pullRequests = { frequency = "30 days" }, dependency = { groupId = "org.scala-lang", artifactId = "scala-library" } }, { pullRequests = { frequency = "30 days" }, dependency = { groupId = "org.scalameta", artifactId = "scalafmt-core" } } ] ```

labels: library-update, early-semver-patch, semver-spec-patch, version-scheme:pvp, old-version-remains, commit-count:n:3


This is an automatic backport of pull request #851 done by Mergify.

mergify[bot] commented 4 months ago

Cherry-pick of dcdc8696043e56da2bdfa2665062769b63a067b9 has failed:

On branch mergify/bp/5.3.x/pr-851
Your branch is ahead of 'origin/5.3.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dcdc869.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   build.sbt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally