Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7487a8b
[dependabot]: Bump the test-dependencies group across 15 directories …
dependabot[bot] Aug 4, 2025
0a2f8aa
Remove jetifier true settings
reidbaker Aug 4, 2025
16d9a6e
Add changelog entry for modified packages
reidbaker Aug 4, 2025
8b916f3
Bump kotlin version to 2.2.0
reidbaker Aug 5, 2025
6e66635
Changelog for kotlin version
reidbaker Aug 5, 2025
c884f12
Only add shadow for mimeTypeMapping on android versions below android s
reidbaker Aug 6, 2025
4b28d89
Update one version per package
reidbaker Aug 6, 2025
f280aa9
align video_player with main
reidbaker Aug 6, 2025
676cbf2
Restore changelog that was accidentally removed
reidbaker Aug 6, 2025
028fdc8
remove unused import
reidbaker Aug 6, 2025
d4a5dd9
Fix missing changelog and version for 3 packages
reidbaker Aug 6, 2025
e1ef71a
undo pidgen change
reidbaker Aug 6, 2025
8cc2896
Merge branch 'main' into dependabot/gradle/packages/camera/camera_and…
reidbaker Aug 6, 2025
fce96ea
typo
reidbaker Aug 6, 2025
3f2731b
SuppressWarnings for known deprecration
reidbaker Aug 6, 2025
83f381a
fix accidentaly changing changelog for camerax
reidbaker Aug 6, 2025
3e76534
Lint warning that kotlin was converting the private scope of sharedPr…
reidbaker Aug 7, 2025
22473ce
Only add mime type to android s and below
reidbaker Aug 7, 2025
298deca
Merge branch 'main' into dependabot/gradle/packages/camera/camera_and…
reidbaker Aug 7, 2025
3ea60e2
Remove jetifier comments from changelog since they impact example apps
reidbaker Aug 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/legacy_project/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ and then deleting everything but `android/` from it:
- Modifies `settings.gradle` to upgrade the Kotlin Gradle Plugin (KGP)
from version 1.9.0 to 2.1.0. If a user runs into an error with the AGP version,
the warning is clear on how to upgrade the version to one that we support.
- Modifies `gradle.properties` to not set android.enableJetifier=true.
1 change: 0 additions & 1 deletion .ci/legacy_project/all_packages/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
1 change: 0 additions & 1 deletion packages/animations/example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
1 change: 0 additions & 1 deletion packages/camera/camera/example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=false
4 changes: 4 additions & 0 deletions packages/camera/camera_android/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.10.10+5

* Removes enableJetifier from gradle.properties.

## 0.10.10+4

* Fix flutter#166533 - prevent startImageStream OOM error when main thread paused.
Expand Down
4 changes: 2 additions & 2 deletions packages/camera/camera_android/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ dependencies {
implementation 'androidx.annotation:annotation:1.9.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.2.0'
testImplementation 'androidx.test:core:1.6.1'
testImplementation 'org.robolectric:robolectric:4.14.1'
testImplementation 'androidx.test:core:1.7.0'
testImplementation 'org.robolectric:robolectric:4.15.1'
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=false
2 changes: 1 addition & 1 deletion packages/camera/camera_android/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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+4
version: 0.10.10+5

environment:
sdk: ^3.6.0
Expand Down
4 changes: 4 additions & 0 deletions packages/camera/camera_android_camerax/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.6.19+2

* Removes enableJetifier from gradle.properties.

## 0.6.19+1

* Fixes incorrect camera switching by selecting a camera via its CameraInfo.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to replace this old line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no fixed

Expand Down
6 changes: 3 additions & 3 deletions packages/camera/camera_android_camerax/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ dependencies {
implementation "androidx.camera:camera-video:${camerax_version}"
implementation 'com.google.guava:guava:33.4.0-android'
testImplementation 'junit:junit:4.13.2'
testImplementation "org.mockito:mockito-core:5.17.0"
testImplementation "org.mockito:mockito-core:5.18.0"
testImplementation 'org.mockito:mockito-inline:5.2.0'
testImplementation 'androidx.test:core:1.6.1'
testImplementation 'org.robolectric:robolectric:4.14.1'
testImplementation 'androidx.test:core:1.7.0'
testImplementation 'org.robolectric:robolectric:4.15.1'
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_android_camerax
description: Android implementation of the camera plugin using the CameraX library.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.6.19+1
version: 0.6.19+2

environment:
sdk: ^3.7.0
Expand Down
1 change: 0 additions & 1 deletion packages/espresso/example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_android/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.5.1+15

* Removes enableJetifier from gradle.properties.

## 0.5.1+14

* Removes obsolete code related to supporting SDK <21.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ android {
implementation 'androidx.annotation:annotation:1.9.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.2.0'
testImplementation 'androidx.test:core:1.6.1'
testImplementation "org.robolectric:robolectric:4.14.1"
testImplementation 'androidx.test:core:1.7.0'
testImplementation "org.robolectric:robolectric:4.15.1"
}

lintOptions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -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.1+14
version: 0.5.1+15

environment:
sdk: ^3.6.0
Expand Down
4 changes: 4 additions & 0 deletions packages/flutter_plugin_android_lifecycle/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.0.29

* Removes enableJetifier from gradle.properties.

## 2.0.28

* Removes obsolete code related to supporting SDK <21.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ android {

dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.17.0'
testImplementation 'org.mockito:mockito-core:5.18.0'
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion packages/flutter_plugin_android_lifecycle/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: flutter_plugin_android_lifecycle
description: Flutter plugin for accessing an Android Lifecycle within other plugins.
repository: https://github.com/flutter/packages/tree/main/packages/flutter_plugin_android_lifecycle
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_plugin_android_lifecycle%22
version: 2.0.28
version: 2.0.29

environment:
sdk: ^3.6.0
Expand Down
1 change: 0 additions & 1 deletion packages/go_router/example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true

Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.17.1

* Removes enableJetifier from gradle.properties.

## 2.17.0

* Updates `com.google.android.gms:play-services-maps` to 19.2.0.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ android {
implementation "androidx.annotation:annotation:1.9.1"
implementation 'com.google.android.gms:play-services-maps:19.2.0'
implementation 'com.google.maps.android:android-maps-utils:3.6.0'
androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.7.0'
androidTestImplementation 'androidx.test:rules:1.7.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.17.0'
testImplementation 'androidx.test:core:1.6.1'
testImplementation "org.robolectric:robolectric:4.14.1"
testImplementation 'org.mockito:mockito-core:5.18.0'
testImplementation 'androidx.test:core:1.7.0'
testImplementation "org.robolectric:robolectric:4.15.1"
}

compileOptions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=false
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: google_maps_flutter_android
description: Android implementation of the google_maps_flutter plugin.
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
version: 2.17.0
version: 2.17.1

environment:
sdk: ^3.6.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
4 changes: 4 additions & 0 deletions packages/image_picker/image_picker_android/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.8.12+25

* Removes enableJetifier from gradle.properties.

## 0.8.12+24

* Updates `androidx.activity:activity` to 1.10.1.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ android {
implementation 'androidx.activity:activity:1.10.1'

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.17.0'
testImplementation 'androidx.test:core:1.6.1'
testImplementation "org.robolectric:robolectric:4.14.1"
testImplementation 'org.mockito:mockito-core:5.18.0'
testImplementation 'androidx.test:core:1.7.0'
testImplementation "org.robolectric:robolectric:4.15.1"
}

compileOptions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: image_picker_android
description: Android implementation of the image_picker plugin.
repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
version: 0.8.12+24
version: 0.8.12+25

environment:
sdk: ^3.6.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.4.0+3

* Removes enableJetifier from gradle.properties.

## 0.4.0+2

* Adds support for setting the `offerToken` on `GooglePlayPurchaseParam`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ dependencies {
implementation 'com.android.billingclient:billing:7.1.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.json:json:20250107'
testImplementation 'org.mockito:mockito-core:5.17.0'
testImplementation 'androidx.test:core:1.6.1'
testImplementation 'org.robolectric:robolectric:4.14.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
testImplementation 'org.mockito:mockito-core:5.18.0'
testImplementation 'androidx.test:core:1.7.0'
testImplementation 'org.robolectric:robolectric:4.15.1'
androidTestImplementation 'androidx.test:runner:1.7.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: An implementation for the Android platform of the Flutter `in_app_p
repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22

version: 0.4.0+2
version: 0.4.0+3

environment:
sdk: ^3.6.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
4 changes: 4 additions & 0 deletions packages/local_auth/local_auth_android/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.0.51

* Removes enableJetifier from gradle.properties.

## 1.0.50

* Updates `androidx.fragment:fragment` to 1.8.8.
Expand Down
6 changes: 3 additions & 3 deletions packages/local_auth/local_auth_android/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ dependencies {
api "androidx.fragment:fragment:1.8.8"
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.2.0'
testImplementation 'org.robolectric:robolectric:4.14.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test:rules:1.6.1'
testImplementation 'org.robolectric:robolectric:4.15.1'
androidTestImplementation 'androidx.test:runner:1.7.0'
androidTestImplementation 'androidx.test:rules:1.7.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth_android/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.0.50
version: 1.0.51

environment:
sdk: ^3.6.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
1 change: 0 additions & 1 deletion packages/pigeon/example/app/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ android {

dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation "org.mockito:mockito-core:5.17.0"
testImplementation "org.mockito:mockito-core:5.18.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ android {

dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation "io.mockk:mockk:1.13.16"
testImplementation "io.mockk:mockk:1.14.5"
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.21"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
4 changes: 4 additions & 0 deletions packages/quick_actions/quick_actions_android/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.0.22

* Removes enableJetifier from gradle.properties.

## 1.0.21

* Removes obsolete code related to supporting SDK <21.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
dependencies {
implementation 'androidx.annotation:annotation:1.9.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.17.0'
testImplementation 'org.mockito:mockito-core:5.18.0'
}

compileOptions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: quick_actions_android
description: An implementation for the Android platform of the Flutter `quick_actions` plugin.
repository: https://github.com/flutter/packages/tree/main/packages/quick_actions/quick_actions_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
version: 1.0.21
version: 1.0.22

environment:
sdk: ^3.6.0
Expand Down
1 change: 0 additions & 1 deletion packages/rfw/example/hello/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
1 change: 0 additions & 1 deletion packages/rfw/example/local/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
Loading