search

playframework / twirl

Twirl is Play's default template engine
Apache License 2.0
545 stars 108 forks source link

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

Closed mergify[bot] closed 6 months ago

mergify[bot] commented 6 months ago

This is an automatic backport of pull request #737 done by Mergify. Cherry-pick of c9bef0a8de2d4a150405535e0fbdc630cc2fcc9e 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 ce5e0f188d079382764c92f11f4ea31812d004fb 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](https://docs.mergify.com/). 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 ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com