Skip to content

Commit 1c0be20

Browse files
authored
[Many] Migrate non examples (and pigeon test) to java 17 (#10201)
Fixes flutter/flutter/issues/176027 - **Update tooling to enforce java 17 compile options and kotlinOptions** - **Update interactive_media_ads and camera_android** - **Update compileOptions to java 17** - **Update changelog and pubspec for modified packages** - **Fix pigeon example** ## Pre-Review Checklist
1 parent ca860ea commit 1c0be20

File tree

136 files changed

+2339
-2194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+2339
-2194
lines changed

packages/camera/camera_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.10.10+10
2+
3+
* Updates Java compatibility version to 17.
4+
15
## 0.10.10+9
26

37
* Resolves Gradle 9 deprecations.

packages/camera/camera_android/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ buildFeatures {
4343
disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
4444
}
4545
compileOptions {
46-
sourceCompatibility = JavaVersion.VERSION_11
47-
targetCompatibility = JavaVersion.VERSION_11
46+
sourceCompatibility = JavaVersion.VERSION_17
47+
targetCompatibility = JavaVersion.VERSION_17
4848
}
4949

5050
testOptions {

packages/camera/camera_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
55

6-
version: 0.10.10+9
6+
version: 0.10.10+10
77

88
environment:
99
sdk: ^3.9.0

packages/camera/camera_android_camerax/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.23+2
2+
3+
* Updates Java compatibility version to 17 and minimum supported SDK version to Flutter 3.35/Dart 3.9.
4+
15
## 0.6.23+1
26

37
* Resolves Gradle 9 deprecations.

packages/camera/camera_android_camerax/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ android {
3030
compileSdk = flutter.compileSdkVersion
3131

3232
compileOptions {
33-
sourceCompatibility = JavaVersion.VERSION_11
34-
targetCompatibility = JavaVersion.VERSION_11
33+
sourceCompatibility = JavaVersion.VERSION_17
34+
targetCompatibility = JavaVersion.VERSION_17
3535
}
3636

3737
kotlinOptions {
3838
// This must match the Java version provided in compileOptions.
39-
jvmTarget = '11'
39+
jvmTarget = JavaVersion.VERSION_17.toString()
4040
}
4141

4242
defaultConfig {

packages/camera/camera_android_camerax/example/integration_test/integration_test.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ void main() {
4848
testWidgets('availableCameras only supports valid back or front cameras', (
4949
WidgetTester tester,
5050
) async {
51-
final List<CameraDescription> availableCameras =
52-
await CameraPlatform.instance.availableCameras();
51+
final List<CameraDescription> availableCameras = await CameraPlatform
52+
.instance
53+
.availableCameras();
5354

5455
for (final CameraDescription cameraDescription in availableCameras) {
5556
expect(
@@ -63,8 +64,8 @@ void main() {
6364
testWidgets('Preview takes expected resolution from preset', (
6465
WidgetTester tester,
6566
) async {
66-
final List<CameraDescription> cameras =
67-
await CameraPlatform.instance.availableCameras();
67+
final List<CameraDescription> cameras = await CameraPlatform.instance
68+
.availableCameras();
6869
if (cameras.isEmpty) {
6970
return;
7071
}
@@ -104,8 +105,8 @@ void main() {
104105
testWidgets('Images from streaming have expected resolution from preset', (
105106
WidgetTester tester,
106107
) async {
107-
final List<CameraDescription> cameras =
108-
await CameraPlatform.instance.availableCameras();
108+
final List<CameraDescription> cameras = await CameraPlatform.instance
109+
.availableCameras();
109110
if (cameras.isEmpty) {
110111
return;
111112
}

packages/camera/camera_android_camerax/example/lib/camera_controller.dart

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,20 +187,17 @@ class CameraValue {
187187
exposurePointSupported ?? this.exposurePointSupported,
188188
focusPointSupported: focusPointSupported ?? this.focusPointSupported,
189189
deviceOrientation: deviceOrientation ?? this.deviceOrientation,
190-
lockedCaptureOrientation:
191-
lockedCaptureOrientation == null
192-
? this.lockedCaptureOrientation
193-
: lockedCaptureOrientation.orNull,
194-
recordingOrientation:
195-
recordingOrientation == null
196-
? this.recordingOrientation
197-
: recordingOrientation.orNull,
190+
lockedCaptureOrientation: lockedCaptureOrientation == null
191+
? this.lockedCaptureOrientation
192+
: lockedCaptureOrientation.orNull,
193+
recordingOrientation: recordingOrientation == null
194+
? this.recordingOrientation
195+
: recordingOrientation.orNull,
198196
isPreviewPaused: isPreviewPaused ?? this.isPreviewPaused,
199197
description: description ?? this.description,
200-
previewPauseOrientation:
201-
previewPauseOrientation == null
202-
? this.previewPauseOrientation
203-
: previewPauseOrientation.orNull,
198+
previewPauseOrientation: previewPauseOrientation == null
199+
? this.previewPauseOrientation
200+
: previewPauseOrientation.orNull,
204201
);
205202
}
206203

packages/camera/camera_android_camerax/example/lib/camera_preview.dart

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,23 @@ class CameraPreview extends StatelessWidget {
2323
Widget build(BuildContext context) {
2424
return controller.value.isInitialized
2525
? ValueListenableBuilder<CameraValue>(
26-
valueListenable: controller,
27-
builder: (BuildContext context, Object? value, Widget? child) {
28-
return AspectRatio(
29-
aspectRatio:
30-
_isLandscape()
31-
? controller.value.aspectRatio
32-
: (1 / controller.value.aspectRatio),
33-
child: Stack(
34-
fit: StackFit.expand,
35-
children: <Widget>[
36-
_wrapInRotatedBox(child: controller.buildPreview()),
37-
child ?? Container(),
38-
],
39-
),
40-
);
41-
},
42-
child: child,
43-
)
26+
valueListenable: controller,
27+
builder: (BuildContext context, Object? value, Widget? child) {
28+
return AspectRatio(
29+
aspectRatio: _isLandscape()
30+
? controller.value.aspectRatio
31+
: (1 / controller.value.aspectRatio),
32+
child: Stack(
33+
fit: StackFit.expand,
34+
children: <Widget>[
35+
_wrapInRotatedBox(child: controller.buildPreview()),
36+
child ?? Container(),
37+
],
38+
),
39+
);
40+
},
41+
child: child,
42+
)
4443
: Container();
4544
}
4645

@@ -73,7 +72,7 @@ class CameraPreview extends StatelessWidget {
7372
return controller.value.isRecordingVideo
7473
? controller.value.recordingOrientation!
7574
: (controller.value.previewPauseOrientation ??
76-
controller.value.lockedCaptureOrientation ??
77-
controller.value.deviceOrientation);
75+
controller.value.lockedCaptureOrientation ??
76+
controller.value.deviceOrientation);
7877
}
7978
}

0 commit comments

Comments
 (0)