Bumping CI to Test Against JDK 21 (#10193)

jesswrd · web-flow · commit 0aa4d9d8c06f · 2025-11-11T20:34:02.000Z
Bumping CI to Test Against JDK 21. This is part of the setup to use a robolectric version that supports SDK 36. This new robolectric version requires JDK 21 at minimum. Edit: On JDK 21+ an error is thrown for this-escape warning due to: https://bugs.openjdk.org/browse/JDK-8015831. Addressing the warning requires removing the abstract funciton `createExoPlayerEventListener` in base class `VideoPlayer.java`, which could cause unknown regressions. Keeping the behavior as-is since the plugin works as expected. Addresses flutter/flutter#163071 Addresses flutter/flutter#177674 ## Pre-Review Checklist **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. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
diff --git a/.ci.yaml b/.ci.yaml
@@ -29,7 +29,7 @@ platform_properties:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:36v3"},
-          {"dependency": "open_jdk", "version": "version:17"},
+          {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "curl", "version": "version:7.64.0"},
           {"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},
           {"dependency": "ninja", "version": "version:1.9.0"}
@@ -129,7 +129,7 @@ targets:
       dependencies: >-
         [
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
-          {"dependency": "open_jdk", "version": "version:17"}
+          {"dependency": "open_jdk", "version": "version:21"}
         ]
       env_variables: >-
         {
diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.10+12
+
+* Removed mockito-inline and updated to mockito-core 5.17.0.
+
 ## 0.10.10+11
 
 * Updates examples to use the new RadioGroup API instead of deprecated Radio parameters.
diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
@@ -68,7 +68,7 @@ buildFeatures {
 dependencies {
     implementation("androidx.annotation:annotation:1.9.1")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-inline:5.2.0")
+    testImplementation("org.mockito:mockito-core:5.17.0")
     testImplementation("androidx.test:core:1.7.0")
     testImplementation("org.robolectric:robolectric:4.15.1")
 }
diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java
@@ -112,7 +112,7 @@ public void setValue(@NonNull ResolutionPreset value) {
   }
 
   @Override
-  public boolean checkIsSupported() {
+  public final boolean checkIsSupported() {
     return cameraId >= 0;
   }
 
diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/sensororientation/SensorOrientationFeature.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/sensororientation/SensorOrientationFeature.java
@@ -58,7 +58,7 @@ public Integer getValue() {
   }
 
   @Override
-  public void setValue(@NonNull Integer value) {
+  public final void setValue(@NonNull Integer value) {
     this.currentSetting = value;
   }
 
diff --git a/packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/ImageSaverTests.java b/packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/ImageSaverTests.java
@@ -22,8 +22,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.MockedStatic;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 public class ImageSaverTests {
 
@@ -32,7 +30,7 @@ public class ImageSaverTests {
   ImageSaver.Callback mockCallback;
   ImageSaver imageSaver;
   Image.Plane mockPlane;
-  ByteBuffer mockBuffer;
+  ByteBuffer byteBuffer;
   MockedStatic<ImageSaver.FileOutputStreamFactory> mockFileOutputStreamFactory;
   FileOutputStream mockFileOutputStream;
 
@@ -42,24 +40,12 @@ public void setup() {
     mockFile = mock(File.class);
     when(mockFile.getAbsolutePath()).thenReturn("absolute/path");
     mockPlane = mock(Image.Plane.class);
-    mockBuffer = mock(ByteBuffer.class);
-    when(mockBuffer.remaining()).thenReturn(3);
-    when(mockBuffer.get(any()))
-        .thenAnswer(
-            new Answer<Object>() {
-              @Override
-              public Object answer(InvocationOnMock invocation) throws Throwable {
-                byte[] bytes = invocation.getArgument(0);
-                bytes[0] = 0x42;
-                bytes[1] = 0x00;
-                bytes[2] = 0x13;
-                return mockBuffer;
-              }
-            });
+    byte[] testData = {0x42, 0x00, 0x13};
+    byteBuffer = ByteBuffer.wrap(testData);
 
     // Set up mocked image dependency
     mockImage = mock(Image.class);
-    when(mockPlane.getBuffer()).thenReturn(mockBuffer);
+    when(mockPlane.getBuffer()).thenReturn(byteBuffer);
     when(mockImage.getPlanes()).thenReturn(new Image.Plane[] {mockPlane});
 
     // Set up mocked FileOutputStream
diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 
-version: 0.10.10+11
+version: 0.10.10+12
 
 environment:
   sdk: ^3.9.0
diff --git a/packages/file_selector/file_selector_android/CHANGELOG.md b/packages/file_selector/file_selector_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.2+2
+
+* Removed mockito-inline and updated to mockito-core 5.17.0.
+
 ## 0.5.2+1
 
 * Resolves Gradle 9 deprecations.
diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle
@@ -37,7 +37,7 @@ android {
     dependencies {
         implementation("androidx.annotation:annotation:1.9.1")
         testImplementation("junit:junit:4.13.2")
-        testImplementation("org.mockito:mockito-inline:5.2.0")
+        testImplementation("org.mockito:mockito-core:5.17.0")
         testImplementation("androidx.test:core:1.7.0")
         testImplementation("org.robolectric:robolectric:4.15.1")
     }
diff --git a/packages/file_selector/file_selector_android/pubspec.yaml b/packages/file_selector/file_selector_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: file_selector_android
 description: Android implementation of the file_selector package.
 repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
-version: 0.5.2+1
+version: 0.5.2+2
 
 environment:
   sdk: ^3.9.0
diff --git a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.2.3
+
+* Removed mockito-inline and updated to mockito-core 5.17.0.
+
 ## 7.2.2
 
 * Updates Java compatibility version to 17 and minimum supported SDK version to Flutter 3.35/Dart 3.9.
diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle
@@ -73,5 +73,5 @@ dependencies {
     implementation("com.google.android.libraries.identity.googleid:googleid:1.1.1")
     implementation("com.google.android.gms:play-services-auth:21.4.0")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-inline:5.2.0")
+    testImplementation("org.mockito:mockito-core:5.17.0")
 }
diff --git a/packages/google_sign_in/google_sign_in_android/pubspec.yaml b/packages/google_sign_in/google_sign_in_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_sign_in_android
 description: Android implementation of the google_sign_in plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 7.2.2
+version: 7.2.3
 
 environment:
   sdk: ^3.9.0
diff --git a/packages/local_auth/local_auth_android/CHANGELOG.md b/packages/local_auth/local_auth_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1
+
+* Removed mockito-inline and updated to mockito-core 5.17.0.
+
 ## 2.0.0
 
 * **BREAKING CHANGES:**
diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle
@@ -60,7 +60,7 @@ dependencies {
     api("androidx.biometric:biometric:1.1.0")
     api("androidx.fragment:fragment:1.8.9")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-inline:5.2.0")
+    testImplementation("org.mockito:mockito-core:5.17.0")
     testImplementation("org.robolectric:robolectric:4.15.1")
     androidTestImplementation("androidx.test:runner:1.7.0")
     androidTestImplementation("androidx.test:rules:1.7.0")
diff --git a/packages/local_auth/local_auth_android/pubspec.yaml b/packages/local_auth/local_auth_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: local_auth_android
 description: Android implementation of the local_auth plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22
-version: 2.0.0
+version: 2.0.1
 
 environment:
   sdk: ^3.9.0
diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.8.18
+
+* Removed mockito-inline and updated to mockito-core 5.17.0.
+
 ## 2.8.17
 
 * Moves video event processing logic to Dart, and fixes an issue where buffer
diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle
@@ -58,7 +58,7 @@ android {
         implementation("androidx.media3:media3-exoplayer-smoothstreaming:${exoplayer_version}")
         testImplementation("junit:junit:4.13.2")
         testImplementation("androidx.test:core:1.7.0")
-        testImplementation("org.mockito:mockito-inline:5.2.0")
+        testImplementation("org.mockito:mockito-core:5.17.0")
         testImplementation("org.robolectric:robolectric:4.15.1")
         testImplementation("androidx.media3:media3-test-utils:${exoplayer_version}")
     }
diff --git a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java
@@ -43,6 +43,9 @@ public interface DisposeHandler {
     void onDispose();
   }
 
+  // Error thrown for this-escape warning on JDK 21+ due to https://bugs.openjdk.org/browse/JDK-8015831.
+  // Keeping behavior as-is and addressing the warning could cause a regression: https://github.com/flutter/packages/pull/10193
+  @SuppressWarnings("this-escape")
   public VideoPlayer(
       @NonNull VideoPlayerCallbacks events,
       @NonNull MediaItem mediaItem,
diff --git a/packages/video_player/video_player_android/example/android/app/build.gradle b/packages/video_player/video_player_android/example/android/app/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     testImplementation("com.google.truth:truth:1.1.3")
     testImplementation("junit:junit:4.13")
     testImplementation("org.robolectric:robolectric:4.10.3")
-    testImplementation("org.mockito:mockito-core:5.0.0")
+    testImplementation("org.mockito:mockito-core:5.17.0")
     androidTestImplementation("androidx.test:runner:1.1.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1")
     implementation(project(':espresso'))
diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player_android
 description: Android implementation of the video_player plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.8.17
+version: 2.8.18
 
 environment:
   sdk: ^3.9.0

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ platform_properties:`
`29`	`29`	`dependencies: >-`
`30`	`30`	`[`
`31`	`31`	`{"dependency": "android_sdk", "version": "version:36v3"},`
`32`		`- {"dependency": "open_jdk", "version": "version:17"},`
	`32`	`+ {"dependency": "open_jdk", "version": "version:21"},`
`33`	`33`	`{"dependency": "curl", "version": "version:7.64.0"},`
`34`	`34`	`{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},`
`35`	`35`	`{"dependency": "ninja", "version": "version:1.9.0"}`
`@@ -129,7 +129,7 @@ targets:`
`129`	`129`	`dependencies: >-`
`130`	`130`	`[`
`131`	`131`	`{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},`
`132`		`- {"dependency": "open_jdk", "version": "version:17"}`
	`132`	`+ {"dependency": "open_jdk", "version": "version:21"}`
`133`	`133`	`]`
`134`	`134`	`env_variables: >-`
`135`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ buildFeatures {`
`68`	`68`	`dependencies {`
`69`	`69`	`implementation("androidx.annotation:annotation:1.9.1")`
`70`	`70`	`testImplementation("junit:junit:4.13.2")`
`71`		`- testImplementation("org.mockito:mockito-inline:5.2.0")`
	`71`	`+ testImplementation("org.mockito:mockito-core:5.17.0")`
`72`	`72`	`testImplementation("androidx.test:core:1.7.0")`
`73`	`73`	`testImplementation("org.robolectric:robolectric:4.15.1")`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void setValue(@NonNull ResolutionPreset value) {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@Override`
`115`		`- public boolean checkIsSupported() {`
	`115`	`+ public final boolean checkIsSupported() {`
`116`	`116`	`return cameraId >= 0;`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public Integer getValue() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public void setValue(@NonNull Integer value) {`
	`61`	`+ public final void setValue(@NonNull Integer value) {`
`62`	`62`	`this.currentSetting = value;`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ android {`
`37`	`37`	`dependencies {`
`38`	`38`	`implementation("androidx.annotation:annotation:1.9.1")`
`39`	`39`	`testImplementation("junit:junit:4.13.2")`
`40`		`- testImplementation("org.mockito:mockito-inline:5.2.0")`
	`40`	`+ testImplementation("org.mockito:mockito-core:5.17.0")`
`41`	`41`	`testImplementation("androidx.test:core:1.7.0")`
`42`	`42`	`testImplementation("org.robolectric:robolectric:4.15.1")`
`43`	`43`	`}`