Merge remote-tracking branch 'upstream/master' into iap/app_facing_add_cancel_status

Author: mvanbeusekom

.ci.yaml

@@ -48,20 +48,6 @@ targets:
         ]
     scheduler: luci
 
-  - name: Windows win32-platform_tests main
-    bringup: true
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: windows_build_and_platform_tests.yaml
-      channel: main
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
   - name: Windows win32-platform_tests stable
     recipe: plugins/plugins
     timeout: 30
@@ -87,20 +73,6 @@ targets:
         ]
     scheduler: luci
 
-  - name: Windows windows-build_all_plugins main
-    bringup: true
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: build_all_plugins.yaml
-      channel: main
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
   - name: Windows windows-build_all_plugins stable
     recipe: plugins/plugins
     timeout: 30
@@ -126,20 +98,6 @@ targets:
         ]
     scheduler: luci
 
-  - name: Windows uwp-platform_tests main
-    bringup: true
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: uwp_build_and_platform_tests.yaml
-      channel: main
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
   - name: Windows plugin_tools_tests
     recipe: plugins/plugins
     timeout: 30

.cirrus.yml

@@ -75,16 +75,16 @@ task:
         CHANGE_DESC: "$TMPDIR/change-description.txt"
       version_check_script:
         # For pre-submit, pass the PR description to the script to allow for
-        # platform version breaking version change justifications.
-        # For post-submit, ignore platform version breaking version changes.
-        # The PR description isn't reliably part of the commit message, so using
-        # the same flags as for presubmit would likely result in false-positive
-        # post-submit failures.
+        # version check overrides.
+        # For post-submit, ignore platform version breaking version changes and
+        # missing version/CHANGELOG detection; the PR description isn't reliably
+        # part of the commit message, so using the same flags as for presubmit
+        # would likely result in false-positive post-submit failures.
         - if [[ $CIRRUS_PR == "" ]]; then
         -   ./script/tool_runner.sh version-check --ignore-platform-interface-breaks
         - else
         -   echo "$CIRRUS_CHANGE_MESSAGE" > "$CHANGE_DESC"
-        -   ./script/tool_runner.sh version-check --change-description-file="$CHANGE_DESC"
+        -   ./script/tool_runner.sh version-check --check-for-missing-changes --change-description-file="$CHANGE_DESC"
         - fi
       publish_check_script: ./script/tool_runner.sh publish-check
     - name: format

.github/labeler.yml

@@ -85,6 +85,8 @@
 
 'platform-ios':
   - packages/*/*_ios/**/*
+  - packages/*/*_storekit/**/*
+  - packages/*/*_wkwebview/**/*
   - packages/**/ios/**/*
 
 'platform-linux':

analysis_options.yaml

@@ -57,6 +57,7 @@ analyzer:
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
     - '**/*.mocks.dart' # Mockito @GenerateMocks
+    - '**/*.pigeon.dart' # Pigeon generated file
 
 linter:
   rules:

analysis_options_legacy.yaml

@@ -5,6 +5,7 @@ analyzer:
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
     - '**/*.mocks.dart' # Mockito @GenerateMocks
+    - '**/*.pigeon.dart' # Pigeon generated file
   errors:
     always_require_non_null_named_parameters: false # not needed with nnbd
     # TODO(https://github.com/flutter/flutter/issues/74381):

packages/android_alarm_manager/CHANGELOG.md

@@ -3,6 +3,7 @@
 * Remove support for the V1 Android embedding.
 * Updated Android lint settings.
 * Removed `-Werror` in Android builds.
+* Updates compileSdkVersion to 31.
 
 ## 2.0.2
 

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"

packages/android_alarm_manager/example/android/app/build.gradle

@@ -25,15 +25,15 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
         applicationId "io.flutter.plugins.androidalarmmanagerexample"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

packages/android_intent/CHANGELOG.md

@@ -4,6 +4,7 @@
 * Updated Android lint settings.
 * Specify Java 8 for Android build.
 * Removed `-Werror` in Android builds.
+* Updates compileSdkVersion to 31.
 
 ## 2.0.2
 

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