Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2024

Pull Request Checklist

Helpful things

Backport changes from #12794


This is an automatic backport of pull request #12796 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jul 10, 2024

This comment was marked as resolved.

@mkurz mkurz changed the title [2.9.x] [3.0.x] Backport Pekko 1.1.0-M1 explicit supervision strategy setting (backport #12796) by @gwak [2.9.x] Backport Pekko 1.1.0-M1 explicit supervision strategy setting (backport #12796) by @gwak Jul 10, 2024
@mkurz mkurz force-pushed the mergify/bp/2.9.x/pr-12796 branch 2 times, most recently from 7ec11b9 to b903d62 Compare July 10, 2024 14:52
@mkurz mkurz removed the conflicts label Jul 10, 2024
@mkurz mkurz changed the title [2.9.x] Backport Pekko 1.1.0-M1 explicit supervision strategy setting (backport #12796) by @gwak [2.9.x] Backport explicit supervision strategy setting (backport #12796) by @gwak Jul 10, 2024
@mkurz
Copy link
Member

mkurz commented Jul 10, 2024

Scripted tests play-sbt-plugin/java-test-helpers fails for Scala 3 only

[info] [error] Test controllers.HomeControllerTest.testOnlyFormDataNoFiles failed: java.lang.NoSuchMethodError: 'akka.japi.function.Function akka.stream.Supervision$.resumingDecider()', took 0.095 sec

https://github.com/playframework/playframework/actions/runs/9876530330/job/27276693023?pr=12797#step:11:6318

Update CSRFActions.scala

merge issue

Add missing imports

reorder splitWhen code due to pekko 1.1 test failures

Update CSRFActions.scala

merge issue

Add missing imports

(cherry picked from commit f66b419)
@mkurz mkurz force-pushed the mergify/bp/2.9.x/pr-12796 branch from b903d62 to 3f3092e Compare July 23, 2024 10:40
java.lang.NoSuchMethodError: 'akka.japi.function.Function akka.stream.Supervision$.resumingDecider()'
In case we ever use native Scala 3 artifacts in the 2.9 branch we can revert this commit
@mkurz
Copy link
Member

mkurz commented Jul 23, 2024

This is caused by the the current approach in the 2.9.x branch to use for3Use2_13 for Scala 3 when using akka-http. It remembers me of

Fortunately we can just use the getter method for now to avoid the error.

@mergify mergify bot merged commit c11fab4 into 2.9.x Jul 23, 2024
@mergify mergify bot deleted the mergify/bp/2.9.x/pr-12796 branch July 23, 2024 12:42
@mkurz mkurz added this to the 2.9.5 milestone Jul 24, 2024
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