From b1b0e0b32d84850e4cc6670dfc55d22179a79e9e Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Sun, 21 Nov 2021 12:48:36 -0500
Subject: [PATCH 1/5] Update all targetSdkVersions

Fixes compilation failures in unit tests on master.
---
 packages/android_alarm_manager/CHANGELOG.md                   | 2 +-
 packages/android_alarm_manager/android/build.gradle           | 2 +-
 packages/android_intent/CHANGELOG.md                          | 2 +-
 packages/android_intent/android/build.gradle                  | 2 +-
 packages/battery/battery/CHANGELOG.md                         | 2 +-
 packages/battery/battery/android/build.gradle                 | 2 +-
 packages/connectivity/connectivity/CHANGELOG.md               | 2 +-
 packages/connectivity/connectivity/android/build.gradle       | 2 +-
 packages/device_info/device_info/CHANGELOG.md                 | 2 +-
 packages/device_info/device_info/android/build.gradle         | 2 +-
 packages/espresso/CHANGELOG.md                                | 2 +-
 packages/espresso/android/build.gradle                        | 2 +-
 packages/flutter_plugin_android_lifecycle/CHANGELOG.md        | 2 +-
 .../flutter_plugin_android_lifecycle/android/build.gradle     | 2 +-
 packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 2 +-
 .../google_maps_flutter/android/build.gradle                  | 2 +-
 packages/google_sign_in/google_sign_in/CHANGELOG.md           | 2 +-
 packages/google_sign_in/google_sign_in/android/build.gradle   | 2 +-
 packages/image_picker/image_picker/CHANGELOG.md               | 2 +-
 packages/image_picker/image_picker/android/build.gradle       | 2 +-
 packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md | 2 +-
 .../in_app_purchase_android/android/build.gradle              | 2 +-
 packages/local_auth/CHANGELOG.md                              | 2 +-
 packages/local_auth/android/build.gradle                      | 2 +-
 packages/package_info/CHANGELOG.md                            | 2 +-
 packages/package_info/android/build.gradle                    | 2 +-
 packages/path_provider/path_provider_android/CHANGELOG.md     | 4 ++++
 .../path_provider/path_provider_android/android/build.gradle  | 2 +-
 packages/quick_actions/quick_actions/CHANGELOG.md             | 4 ++++
 packages/quick_actions/quick_actions/android/build.gradle     | 2 +-
 packages/sensors/CHANGELOG.md                                 | 2 +-
 packages/sensors/android/build.gradle                         | 2 +-
 packages/share/CHANGELOG.md                                   | 2 +-
 packages/share/android/build.gradle                           | 2 +-
 .../shared_preferences_android/CHANGELOG.md                   | 4 ++++
 .../shared_preferences_android/android/build.gradle           | 2 +-
 .../example/android/app/build.gradle                          | 2 +-
 packages/video_player/video_player/CHANGELOG.md               | 2 +-
 packages/video_player/video_player/android/build.gradle       | 2 +-
 packages/webview_flutter/webview_flutter_android/CHANGELOG.md | 2 +-
 .../webview_flutter_android/android/build.gradle              | 2 +-
 packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md     | 2 +-
 .../wifi_info_flutter/wifi_info_flutter/android/build.gradle  | 2 +-
 43 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 7d90afbe4de2..d57dbed9ede1 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -3,7 +3,7 @@
 * Remove support for the V1 Android embedding.
 * Updated Android lint settings.
 * Removed `-Werror` in Android builds.
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 2.0.2
 
diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle
index 9236ffbdd086..4862c7942afa 100644
--- a/packages/android_alarm_manager/android/build.gradle
+++ b/packages/android_alarm_manager/android/build.gradle
@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
index 7bad13fc3dbd..2c44f29ab148 100644
--- a/packages/android_intent/CHANGELOG.md
+++ b/packages/android_intent/CHANGELOG.md
@@ -4,7 +4,7 @@
 * Updated Android lint settings.
 * Specify Java 8 for Android build.
 * Removed `-Werror` in Android builds.
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 2.0.2
 
diff --git a/packages/android_intent/android/build.gradle b/packages/android_intent/android/build.gradle
index 4bc8e85c40bc..f9317a53a2ba 100644
--- a/packages/android_intent/android/build.gradle
+++ b/packages/android_intent/android/build.gradle
@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/battery/battery/CHANGELOG.md b/packages/battery/battery/CHANGELOG.md
index f55da97d9f90..1ab884f499e9 100644
--- a/packages/battery/battery/CHANGELOG.md
+++ b/packages/battery/battery/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 * Remove references to the Android v1 embedding.
 * Updated Android lint settings.
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 * Recreated Android example from current template.
 
 ## 2.0.3
diff --git a/packages/battery/battery/android/build.gradle b/packages/battery/battery/android/build.gradle
index 14f503813f7e..bd094768f2f4 100644
--- a/packages/battery/battery/android/build.gradle
+++ b/packages/battery/battery/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/connectivity/connectivity/CHANGELOG.md b/packages/connectivity/connectivity/CHANGELOG.md
index ce65faf4c3fb..53814ae3e1dc 100644
--- a/packages/connectivity/connectivity/CHANGELOG.md
+++ b/packages/connectivity/connectivity/CHANGELOG.md
@@ -4,7 +4,7 @@
 * Updated Android lint settings.
 * Specify Java 8 for Android build.
 * Removed `-Werror` in Android builds.
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 3.0.6
 
diff --git a/packages/connectivity/connectivity/android/build.gradle b/packages/connectivity/connectivity/android/build.gradle
index 33c63fcb5619..b29f1575ea8d 100644
--- a/packages/connectivity/connectivity/android/build.gradle
+++ b/packages/connectivity/connectivity/android/build.gradle
@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/device_info/device_info/CHANGELOG.md b/packages/device_info/device_info/CHANGELOG.md
index a9c3b7a1dffe..825b12d8c7ad 100644
--- a/packages/device_info/device_info/CHANGELOG.md
+++ b/packages/device_info/device_info/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 2.0.3
 
diff --git a/packages/device_info/device_info/android/build.gradle b/packages/device_info/device_info/android/build.gradle
index ed89da419d4a..67fbf1fe5c65 100644
--- a/packages/device_info/device_info/android/build.gradle
+++ b/packages/device_info/device_info/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index c2afa54780f5..3f19984b9437 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 0.1.0+4
 
diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
index da0cd2ebfee8..e5a042095c2f 100644
--- a/packages/espresso/android/build.gradle
+++ b/packages/espresso/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
index 414cf8e1aeda..62638106a133 100644
--- a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
+++ b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 2.0.4
 
diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle
index 5a584b4e366f..7f44c6584456 100644
--- a/packages/flutter_plugin_android_lifecycle/android/build.gradle
+++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
index b5e739aa01ee..e47ecb7725c9 100644
--- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 2.1.1
 
diff --git a/packages/google_maps_flutter/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter/android/build.gradle
index e3cf6ffe8818..bf283bea9ef9 100644
--- a/packages/google_maps_flutter/google_maps_flutter/android/build.gradle
+++ b/packages/google_maps_flutter/google_maps_flutter/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 20
diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md
index 739983b2916d..7ff50a4bb24a 100644
--- a/packages/google_sign_in/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/google_sign_in/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 5.2.1
 
diff --git a/packages/google_sign_in/google_sign_in/android/build.gradle b/packages/google_sign_in/google_sign_in/android/build.gradle
index ea98b315f147..5db929b173a8 100644
--- a/packages/google_sign_in/google_sign_in/android/build.gradle
+++ b/packages/google_sign_in/google_sign_in/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
index 688cee3eed01..ce29eb522e3d 100644
--- a/packages/image_picker/image_picker/CHANGELOG.md
+++ b/packages/image_picker/image_picker/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 * Fix iOS RunnerUITests search paths.
 
 ## 0.8.4+4
diff --git a/packages/image_picker/image_picker/android/build.gradle b/packages/image_picker/image_picker/android/build.gradle
index 1e6439e6a4eb..928c7cda8b03 100755
--- a/packages/image_picker/image_picker/android/build.gradle
+++ b/packages/image_picker/image_picker/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
index 7724dd3d7f14..4198d9345889 100644
--- a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
+++ b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 0.2.0
 
diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle
index 656f7c34bf7a..cbb0855509a5 100644
--- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle
+++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md
index a824d8a6e0ea..82358d61e644 100644
--- a/packages/local_auth/CHANGELOG.md
+++ b/packages/local_auth/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 1.1.8
 
diff --git a/packages/local_auth/android/build.gradle b/packages/local_auth/android/build.gradle
index dc282e78ced0..de8ae50641b2 100644
--- a/packages/local_auth/android/build.gradle
+++ b/packages/local_auth/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md
index 3cf675170513..ca1a943d644a 100644
--- a/packages/package_info/CHANGELOG.md
+++ b/packages/package_info/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 * Remove references to the Android v1 embedding.
 * Updated Android lint settings.
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 2.0.2
 
diff --git a/packages/package_info/android/build.gradle b/packages/package_info/android/build.gradle
index e21d911ff490..ad620add0f93 100644
--- a/packages/package_info/android/build.gradle
+++ b/packages/package_info/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md
index ed14cb703d41..8b631e5136c3 100644
--- a/packages/path_provider/path_provider_android/CHANGELOG.md
+++ b/packages/path_provider/path_provider_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates Android compileSdkVersion to 31.
+
 ## 2.0.8
 
 * Updates example app Android compileSdkVersion to 31.
diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle
index 1a22f135fe5a..c7ceec2584c6 100644
--- a/packages/path_provider/path_provider_android/android/build.gradle
+++ b/packages/path_provider/path_provider_android/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/quick_actions/quick_actions/CHANGELOG.md b/packages/quick_actions/quick_actions/CHANGELOG.md
index c49f1149daab..497f98a9def2 100644
--- a/packages/quick_actions/quick_actions/CHANGELOG.md
+++ b/packages/quick_actions/quick_actions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates Android compileSdkVersion to 31.
+
 ## 0.6.0+8
 
 * Updates example app Android compileSdkVersion to 31.
diff --git a/packages/quick_actions/quick_actions/android/build.gradle b/packages/quick_actions/quick_actions/android/build.gradle
index ec3f84eab4cf..590bc6b4a826 100644
--- a/packages/quick_actions/quick_actions/android/build.gradle
+++ b/packages/quick_actions/quick_actions/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/sensors/CHANGELOG.md b/packages/sensors/CHANGELOG.md
index 3dbc5d2f7df1..b5d64b48edda 100644
--- a/packages/sensors/CHANGELOG.md
+++ b/packages/sensors/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 * Remove references to the Android V1 embedding.
 * Updated Android lint settings.
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 2.0.3
 
diff --git a/packages/sensors/android/build.gradle b/packages/sensors/android/build.gradle
index 7e1087764dee..a9a9045301c9 100644
--- a/packages/sensors/android/build.gradle
+++ b/packages/sensors/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/share/CHANGELOG.md b/packages/share/CHANGELOG.md
index 1c93b487e27b..effc12c023c0 100644
--- a/packages/share/CHANGELOG.md
+++ b/packages/share/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 * Remove references to the Android V1 embedding.
 * Updated Android lint settings.
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 2.0.4
 
diff --git a/packages/share/android/build.gradle b/packages/share/android/build.gradle
index b2ea363a3e11..c4fcafc70d26 100644
--- a/packages/share/android/build.gradle
+++ b/packages/share/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
index 85baf316f0ae..940b6532145a 100644
--- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates compileSdkVersion to 31.
+
 ## 2.0.8
 
 * Split from `shared_preferences` as a federated implementation.
diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle
index 9284f1c36143..6eeab718059f 100644
--- a/packages/shared_preferences/shared_preferences_android/android/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle
@@ -30,7 +30,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
index 857ac4730a77..4cbb7307769c 100644
--- a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
diff --git a/packages/video_player/video_player/CHANGELOG.md b/packages/video_player/video_player/CHANGELOG.md
index 7e9dfff39c69..f9031685b583 100644
--- a/packages/video_player/video_player/CHANGELOG.md
+++ b/packages/video_player/video_player/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## NEXT
 
 * Fixes integration tests.
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 2.2.7
 
diff --git a/packages/video_player/video_player/android/build.gradle b/packages/video_player/video_player/android/build.gradle
index 5d6b737f47a5..6e6e8c792150 100644
--- a/packages/video_player/video_player/android/build.gradle
+++ b/packages/video_player/video_player/android/build.gradle
@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
index b978b088d365..ae76ea8bc342 100644
--- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
+++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates example app Android compileSdkVersion to 31.
+* Updates compileSdkVersion to 31.
 
 ## 2.3.0
 
diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle
index bb9fe9708eaa..e70d4e68edc8 100644
--- a/packages/webview_flutter/webview_flutter_android/android/build.gradle
+++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 19
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md b/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md
index 3248b203173b..0e41699be340 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md
+++ b/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 * Updated Android lint settings.
 * Updated package description.
-* Updates example app Android compileSdkVersion to 31.
+* Updates Android compileSdkVersion to 31.
 
 ## 2.0.2
 
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/android/build.gradle b/packages/wifi_info_flutter/wifi_info_flutter/android/build.gradle
index 661ee82da4d0..76ac3bc7eedc 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/android/build.gradle
+++ b/packages/wifi_info_flutter/wifi_info_flutter/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16

From 8be5f2401f894b7f0fe8fad64db72293cd0423b4 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Mon, 22 Nov 2021 16:07:19 -0500
Subject: [PATCH 2/5] Revert things moved to 4535

---
 packages/flutter_plugin_android_lifecycle/CHANGELOG.md        | 2 +-
 .../flutter_plugin_android_lifecycle/android/build.gradle     | 2 +-
 packages/path_provider/path_provider_android/CHANGELOG.md     | 4 ----
 .../path_provider/path_provider_android/android/build.gradle  | 2 +-
 .../shared_preferences_android/CHANGELOG.md                   | 4 ----
 .../shared_preferences_android/android/build.gradle           | 2 +-
 .../example/android/app/build.gradle                          | 2 +-
 7 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
index 62638106a133..414cf8e1aeda 100644
--- a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
+++ b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates compileSdkVersion to 31.
+* Updates example app Android compileSdkVersion to 31.
 
 ## 2.0.4
 
diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle
index 7f44c6584456..5a584b4e366f 100644
--- a/packages/flutter_plugin_android_lifecycle/android/build.gradle
+++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md
index 8b631e5136c3..ed14cb703d41 100644
--- a/packages/path_provider/path_provider_android/CHANGELOG.md
+++ b/packages/path_provider/path_provider_android/CHANGELOG.md
@@ -1,7 +1,3 @@
-## NEXT
-
-* Updates Android compileSdkVersion to 31.
-
 ## 2.0.8
 
 * Updates example app Android compileSdkVersion to 31.
diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle
index c7ceec2584c6..1a22f135fe5a 100644
--- a/packages/path_provider/path_provider_android/android/build.gradle
+++ b/packages/path_provider/path_provider_android/android/build.gradle
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
index 940b6532145a..85baf316f0ae 100644
--- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
@@ -1,7 +1,3 @@
-## NEXT
-
-* Updates compileSdkVersion to 31.
-
 ## 2.0.8
 
 * Split from `shared_preferences` as a federated implementation.
diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle
index 6eeab718059f..9284f1c36143 100644
--- a/packages/shared_preferences/shared_preferences_android/android/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle
@@ -30,7 +30,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
index 4cbb7307769c..857ac4730a77 100644
--- a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

From b4a8c7c27e20d24fac17d30918fcb0f2c1ba7fe2 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Mon, 22 Nov 2021 16:09:17 -0500
Subject: [PATCH 3/5] Disable android_alarm_manager integration tests

---
 script/configs/exclude_integration_android.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/script/configs/exclude_integration_android.yaml b/script/configs/exclude_integration_android.yaml
index e06b062fd68f..e44f8d03ec57 100644
--- a/script/configs/exclude_integration_android.yaml
+++ b/script/configs/exclude_integration_android.yaml
@@ -5,6 +5,10 @@
 - sensors
 - share
 - wifi_info_flutter/wifi_info_flutter
+# Deprecated; broke in the update to targetSdkVersion 31,
+# and no plan to fix it since it is not expected to
+# receive any future changes.
+- android_alarm_manager
 
 # No integration tests to run:
 - espresso

From 5fc687e5e53be2c185be7a9a6a57700cb95d2f5e Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Mon, 22 Nov 2021 16:33:12 -0500
Subject: [PATCH 4/5] Bump min SDK for example apps with dex issues

---
 .../android_alarm_manager/example/android/app/build.gradle    | 2 +-
 .../quick_actions/example/android/app/build.gradle            | 2 +-
 script/configs/exclude_integration_android.yaml               | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/android_alarm_manager/example/android/app/build.gradle b/packages/android_alarm_manager/example/android/app/build.gradle
index 4efe095b7760..c8ff51fe7a82 100644
--- a/packages/android_alarm_manager/example/android/app/build.gradle
+++ b/packages/android_alarm_manager/example/android/app/build.gradle
@@ -33,7 +33,7 @@ android {
 
     defaultConfig {
         applicationId "io.flutter.plugins.androidalarmmanagerexample"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/packages/quick_actions/quick_actions/example/android/app/build.gradle b/packages/quick_actions/quick_actions/example/android/app/build.gradle
index 465b4a62a9cd..54f2e59bacf7 100644
--- a/packages/quick_actions/quick_actions/example/android/app/build.gradle
+++ b/packages/quick_actions/quick_actions/example/android/app/build.gradle
@@ -33,7 +33,7 @@ android {
 
     defaultConfig {
         applicationId "io.flutter.plugins.quickactionsexample"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/script/configs/exclude_integration_android.yaml b/script/configs/exclude_integration_android.yaml
index e44f8d03ec57..e06b062fd68f 100644
--- a/script/configs/exclude_integration_android.yaml
+++ b/script/configs/exclude_integration_android.yaml
@@ -5,10 +5,6 @@
 - sensors
 - share
 - wifi_info_flutter/wifi_info_flutter
-# Deprecated; broke in the update to targetSdkVersion 31,
-# and no plan to fix it since it is not expected to
-# receive any future changes.
-- android_alarm_manager
 
 # No integration tests to run:
 - espresso

From be3611232e9826b2c242c761d13cbbcf193e23fe Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Mon, 22 Nov 2021 14:59:01 -0800
Subject: [PATCH 5/5] Enable multidex in more examples: video_player,
 webview_flutter, webview_flutter_android

---
 .../video_player/video_player/example/android/app/build.gradle  | 2 +-
 .../webview_flutter/example/android/app/build.gradle            | 2 +-
 .../webview_flutter_android/example/android/app/build.gradle    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/video_player/video_player/example/android/app/build.gradle b/packages/video_player/video_player/example/android/app/build.gradle
index b1aaf8b45a8b..7b3c7db80c7e 100644
--- a/packages/video_player/video_player/example/android/app/build.gradle
+++ b/packages/video_player/video_player/example/android/app/build.gradle
@@ -37,7 +37,7 @@ android {
 
     defaultConfig {
         applicationId "io.flutter.plugins.videoplayerexample"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/packages/webview_flutter/webview_flutter/example/android/app/build.gradle b/packages/webview_flutter/webview_flutter/example/android/app/build.gradle
index 0193946331cd..532b2adde9d6 100644
--- a/packages/webview_flutter/webview_flutter/example/android/app/build.gradle
+++ b/packages/webview_flutter/webview_flutter/example/android/app/build.gradle
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.webviewflutterexample"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle
index 932aba4eb5a8..fdd8193eb2b6 100644
--- a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle
+++ b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.webviewflutterandroidexample"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName