Skip to content
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.

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

[3.0.x] [play-]slick now comes with Scala 3 artifacts (backport #368) by @mkurz #550

Merged
merged 9 commits into from
Feb 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2024

This is an automatic backport of pull request #368 done by Mergify.
Cherry-pick of 132232b has failed:

On branch mergify/bp/3.0.x/pr-368
Your branch is up to date with 'origin/3.0.x'.

You are currently cherry-picking commit 132232ba.
  (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)

Changes to be committed:
	modified:   play-scala-slick-example/samples/basic/app/controllers/Application.scala
	modified:   play-scala-slick-example/samples/basic/app/dao/CatDAO.scala
	modified:   play-scala-slick-example/samples/basic/app/dao/DogDAO.scala
	modified:   play-scala-slick-example/samples/computer-database/app/controllers/Application.scala
	modified:   play-scala-slick-example/samples/computer-database/app/dao/CompaniesDAO.scala
	modified:   play-scala-slick-example/samples/computer-database/app/dao/ComputersDAO.scala
	modified:   play-scala-slick-example/samples/computer-database/app/views/createForm.scala.html
	modified:   play-scala-slick-example/samples/computer-database/app/views/editForm.scala.html
	modified:   play-scala-slick-example/samples/person/app/controllers/PersonController.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   play-scala-slick-example/build.sbt

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

PeuTit and others added 9 commits February 25, 2024 10:52
Currently stuck on typing error with `TableQuery`
I need to make sure that the error is not caused by my version of `play-slick`

(cherry picked from commit 132232b)

# Conflicts:
#	play-scala-slick-example/build.sbt
(cherry picked from commit 3d48198)
(cherry picked from commit f5294d3)
(cherry picked from commit c3fd7fd)
(cherry picked from commit 97ead52)
(cherry picked from commit 90c8b17)
@mkurz mkurz force-pushed the mergify/bp/3.0.x/pr-368 branch from 7ff2316 to 091561f Compare February 25, 2024 09:52
@mkurz mkurz removed the conflicts label Feb 25, 2024
@mkurz mkurz merged commit c3946db into 3.0.x Feb 25, 2024
17 checks passed
@mkurz mkurz deleted the mergify/bp/3.0.x/pr-368 branch February 25, 2024 10:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants