Rebase

.cirrus.yml

@@ -122,8 +122,13 @@ task:
         - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
         - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh ios --no-codesign
-    - name: lint_podspecs
-      script: dart ./script/lint_podspecs.dart
+    - name: lint_darwin_plugins
+      script:
+        # TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
+        - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
+        # Skip the dummy podspecs used to placate the tool.
+        - find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
+        - ./script/incremental_build.sh podspecs --no-analyze camera --skip google_sign_in --skip webview_flutter
     - name: build-ipas+drive-examples
       env:
         PATH: $PATH:/usr/local/bin
@@ -162,8 +167,6 @@ task:
       script:
         - flutter channel master
         - ./script/build_all_plugins_app.sh macos
-    - name: lint_darwin_plugins
-      script: ./script/lint_darwin_plugins.sh
     - name: build-apps+drive-examples
       env:
         PATH: $PATH:/usr/local/bin