Skip to content

Commit 61e5be0

Browse files
bparrishMinesbparrishMines
committed
Merge branch 'main' of github.com:flutter/packages into webview_android_pigeon_2
2 parents d4a017a + 4afc383 commit 61e5be0

File tree

84 files changed

+251
-289
lines changed

Some content is hidden

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

84 files changed

+251
-289
lines changed

‎packages/camera/camera_android/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.10.9+12
2+
3+
* Updates Java compatibility version to 11.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 0.10.9+11
27

38
* Updates annotations lib to 1.8.2.

‎packages/camera/camera_android/android/build.gradle‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ android {
3030
buildFeatures {
3131
buildConfig true
3232
}
33-
// Conditional for compatibility with AGP <4.2.
34-
if (project.android.hasProperty("namespace")) {
35-
namespace 'io.flutter.plugins.camera'
36-
}
33+
namespace 'io.flutter.plugins.camera'
3734
compileSdk 34
3835

3936
defaultConfig {
@@ -46,8 +43,8 @@ buildFeatures {
4643
disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
4744
}
4845
compileOptions {
49-
sourceCompatibility JavaVersion.VERSION_1_8
50-
targetCompatibility JavaVersion.VERSION_1_8
46+
sourceCompatibility JavaVersion.VERSION_11
47+
targetCompatibility JavaVersion.VERSION_11
5148
}
5249

5350
testOptions {

‎packages/camera/camera_android/example/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Demonstrates how to use the camera plugin.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.4.0
7-
flutter: ">=3.22.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
camera_android:

‎packages/camera/camera_android/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ 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.9+11
6+
version: 0.10.9+12
77

88
environment:
9-
sdk: ^3.4.0
10-
flutter: ">=3.22.0"
9+
sdk: ^3.5.0
10+
flutter: ">=3.24.0"
1111

1212
flutter:
1313
plugin:

‎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.9+2
2+
3+
* Updates Java compatibility version to 11.
4+
15
## 0.6.9+1
26

37
* Bumps `com.google.guava:guava` from `33.3.0` to `33.3.1`.

‎packages/camera/camera_android_camerax/android/build.gradle‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@ rootProject.allprojects {
2222
apply plugin: 'com.android.library'
2323

2424
android {
25-
// Conditional for compatibility with AGP <4.2.
26-
if (project.android.hasProperty("namespace")) {
27-
namespace 'io.flutter.plugins.camerax'
28-
}
25+
namespace 'io.flutter.plugins.camerax'
2926
// CameraX dependencies require compilation against version 33 or later.
3027
compileSdk 34
3128

3229
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_1_8
34-
targetCompatibility JavaVersion.VERSION_1_8
30+
sourceCompatibility JavaVersion.VERSION_11
31+
targetCompatibility JavaVersion.VERSION_11
3532
}
3633

3734
defaultConfig {

‎packages/camera/camera_android_camerax/example/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131
ndkVersion flutter.ndkVersion
3232

3333
compileOptions {
34-
sourceCompatibility JavaVersion.VERSION_1_8
35-
targetCompatibility JavaVersion.VERSION_1_8
34+
sourceCompatibility JavaVersion.VERSION_11
35+
targetCompatibility JavaVersion.VERSION_11
3636
}
3737

3838
defaultConfig {

‎packages/camera/camera_android_camerax/pubspec.yaml‎

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

77
environment:
88
sdk: ^3.5.0

‎packages/espresso/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.4.0+3
2+
3+
* Updates Java compatibility version to 11.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 0.4.0+2
27

38
* Bumps `com.google.guava:guava` from `31.1` to `33.3.1`.

‎packages/espresso/android/build.gradle‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ rootProject.allprojects {
2222
apply plugin: 'com.android.library'
2323

2424
android {
25-
// Conditional for compatibility with AGP <4.2.
26-
if (project.android.hasProperty("namespace")) {
27-
namespace 'com.example.espresso'
28-
}
25+
namespace 'com.example.espresso'
2926
compileSdk 34
3027

3128
defaultConfig {
@@ -34,8 +31,8 @@ android {
3431
}
3532

3633
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_1_8
38-
targetCompatibility JavaVersion.VERSION_1_8
34+
sourceCompatibility JavaVersion.VERSION_11
35+
targetCompatibility JavaVersion.VERSION_11
3936
}
4037

4138
lintOptions {

0 commit comments

Comments
 (0)