Skip to content

Commit 2fe1881

Browse files
jesswrdsuryaKommana2662
authored andcommitted
Update Engine to test against JDK 25 (flutter#193470)
Update Engine to test against JDK 25 Partially Addresses flutter#193404 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant in-code documentation (doc comments with `///`). - [x] If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [flutter/website]: https://github.com/flutter/website [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 689f2a7 commit 2fe1881

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ deps = {
653653
'packages': [
654654
{
655655
'package': 'flutter/java/openjdk/${{platform}}',
656-
'version': 'version:21'
656+
'version': 'version:25.0.2'
657657
}
658658
],
659659
'condition': 'not (host_os == "linux" and host_cpu == "arm64")',

‎engine/src/flutter/.ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ platform_properties:
1616
# CIPD flutter/java/openjdk/$platform
1717
dependencies: >-
1818
[
19-
{"dependency": "open_jdk", "version": "version:21"},
19+
{"dependency": "open_jdk", "version": "version:25.0.2"},
2020
{"dependency": "gradle_cache", "version": "none"}
2121
]
2222
device_type: none
@@ -28,7 +28,7 @@ platform_properties:
2828
# CIPD flutter/java/openjdk/$platform
2929
dependencies: >-
3030
[
31-
{"dependency": "open_jdk", "version": "version:21"}
31+
{"dependency": "open_jdk", "version": "version:25.0.2"}
3232
]
3333
device_type: none
3434
os: Mac-15.7|Mac-26.6
@@ -41,7 +41,7 @@ platform_properties:
4141
# CIPD flutter/java/openjdk/$platform
4242
dependencies: >-
4343
[
44-
{"dependency": "open_jdk", "version": "version:21"}
44+
{"dependency": "open_jdk", "version": "version:25.0.2"}
4545
]
4646
device_type: none
4747
os: Windows-10

‎engine/src/flutter/ci/builders/linux_android_emulator.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
{
2828
"dependency": "open_jdk",
29-
"version": "version:21"
29+
"version": "version:25.0.2"
3030
}
3131
],
3232
"name": "ci/android_emulator_debug_x64",

‎engine/src/flutter/ci/builders/local_engine.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@
10511051
"dependencies": [
10521052
{
10531053
"dependency": "open_jdk",
1054-
"version": "version:21"
1054+
"version": "version:25.0.2"
10551055
}
10561056
],
10571057
"gn": [
@@ -1087,7 +1087,7 @@
10871087
"dependencies": [
10881088
{
10891089
"dependency": "open_jdk",
1090-
"version": "version:21"
1090+
"version": "version:25.0.2"
10911091
}
10921092
],
10931093
"gn": [

‎engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,8 +1668,8 @@ public void cleanUpFlutterEngine(@NonNull FlutterEngine flutterEngine) {
16681668
}
16691669

16701670
/**
1671-
* See {@link NewEngineFragmentBuilder#shouldAttachEngineToActivity()} and {@link
1672-
* CachedEngineFragmentBuilder#shouldAttachEngineToActivity()}.
1671+
* See {@link NewEngineFragmentBuilder#shouldAttachEngineToActivity(boolean)} and {@link
1672+
* CachedEngineFragmentBuilder#shouldAttachEngineToActivity(boolean)}.
16731673
*
16741674
* <p>Used by this {@code FlutterFragment}'s {@link FlutterActivityAndFragmentDelegate}
16751675
*/

‎engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ public boolean shouldDestroyEngineWithHost() {
691691
* {@code Activity}.
692692
*
693693
* <p>For an explanation of why this control exists, see {@link
694-
* FlutterFragment.NewEngineFragmentBuilder#shouldAttachEngineToActivity()}.
694+
* FlutterFragment.NewEngineFragmentBuilder#shouldAttachEngineToActivity(boolean)}.
695695
*
696696
* <p>This property is controlled with a protected method instead of an {@code Intent} argument
697697
* because the only situation where changing this value would help, is a situation in which {@code

0 commit comments

Comments
 (0)