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

[1.6.x] compiler: account for Scala 2 and 3 differences in generated varargs code (backport #737) by @ahjohannessen #738

Merged
merged 5 commits into from
Feb 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2024

This is an automatic backport of pull request #737 done by Mergify.
Cherry-pick of c9bef0a has failed:

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

You are currently cherry-picking commit c9bef0a.
  (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:   compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala
	modified:   compiler/src/test/scala-2/play/twirl/compiler/test/Helper.scala
	modified:   compiler/src/test/scala-3/play/twirl/compiler/test/Helper.scala
	modified:   sbt-twirl/src/main/scala/play/twirl/sbt/SbtTwirl.scala
	modified:   sbt-twirl/src/main/scala/play/twirl/sbt/TemplateCompiler.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .gitignore
	both modified:   compiler/src/main/java/play/japi/twirl/compiler/TwirlCompiler.java

Cherry-pick of ce5e0f1 has failed:

On branch mergify/bp/1.6.x/pr-737
Your branch is ahead of 'origin/1.6.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ce5e0f1.
  (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:   .gitignore

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


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

ahjohannessen and others added 5 commits February 27, 2024 12:30
(cherry picked from commit c9bef0a)

# Conflicts:
#	.gitignore
#	compiler/src/main/java/play/japi/twirl/compiler/TwirlCompiler.java
(cherry picked from commit 3190e1e)
(cherry picked from commit 7fdb505)
(cherry picked from commit ce5e0f1)
(cherry picked from commit c38c2e9)
@mergify mergify bot merged commit 48ebd87 into 1.6.x Feb 27, 2024
16 checks passed
@mergify mergify bot deleted the mergify/bp/1.6.x/pr-737 branch February 27, 2024 11:39
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.

None yet

2 participants