ci: enable usePubspecOverrides (#10046)

Author: blaugold

.github/workflows/all_plugins.yaml

@@ -95,7 +95,7 @@ jobs:
       - name: 'Build Examples'
         run: |
           melos exec -c 1 --scope="*example*" --dir-exists="web" -- \
-            "flutter build web --no-pub"
+            "flutter build web"
 
   test:
     runs-on: ubuntu-latest
@@ -132,4 +132,4 @@ jobs:
           # for the `check-license-header` script.
           run-bootstrap: false
       - name: Check license header
-        run: melos run check-license-header 
+        run: melos run check-license-header

.github/workflows/e2e_tests.yaml

@@ -74,6 +74,11 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+      - uses: bluefireteam/melos-action@v2
+        with:
+          run-bootstrap: false
+      - name: "Bootstrap package"
+        run: melos bootstrap --scope tests
       - name: "Install Tools"
         run: |
           sudo npm i -g firebase-tools
@@ -148,6 +153,11 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+      - uses: bluefireteam/melos-action@v2
+        with:
+          run-bootstrap: false
+      - name: "Bootstrap package"
+        run: melos bootstrap --scope tests
       - name: "Install Tools"
         run: |
           sudo npm i -g firebase-tools
@@ -215,6 +225,11 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+      - uses: bluefireteam/melos-action@v2
+        with:
+          run-bootstrap: false
+      - name: "Bootstrap package"
+        run: melos bootstrap --scope tests
       - name: "Install Tools"
         run: |
           sudo npm i -g firebase-tools
@@ -256,6 +271,11 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+      - uses: bluefireteam/melos-action@v2
+        with:
+          run-bootstrap: false
+      - name: "Bootstrap package"
+        run: melos bootstrap --scope tests
       - name: "Install Tools"
         run: |
           sudo npm i -g firebase-tools

.github/workflows/firebase_firestore_odm.yaml

@@ -41,8 +41,6 @@ jobs:
           melos bootstrap --scope="*firebase_core*" --scope="$FLUTTERFIRE_PLUGIN_SCOPE"
           melos run odm:example_build_runner:build
           melos run odm:generator_test_build_runner:build
-          # Needed because generating breaks the local linking of melos
-          melos bootstrap --scope="*firebase_core*" --scope="$FLUTTERFIRE_PLUGIN_SCOPE"
       - name: "Flutter Test"
         run: melos run odm:test:flutter --no-select
       - name: "Dart Test"

.github/workflows/scripts/drive-example.sh

@@ -7,7 +7,7 @@ then
   # Sleep to allow emulator to settle.
   sleep 15
   melos exec -c 1 --fail-fast --scope="$FLUTTERFIRE_PLUGIN_SCOPE_EXAMPLE" --dir-exists=integration_test -- \
-    flutter test integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart $FLUTTER_COMMAND_FLAGS --no-pub --dart-define=CI=true
+    flutter test integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart $FLUTTER_COMMAND_FLAGS --dart-define=CI=true
   exit
 fi
 
@@ -22,7 +22,7 @@ then
   # Uncomment following line to have simulator logs printed out for debugging purposes.
   # xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' &
   melos exec -c 1 --fail-fast --scope="$FLUTTERFIRE_PLUGIN_SCOPE_EXAMPLE" --dir-exists=integration_test -- \
-    flutter test integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart $FLUTTER_COMMAND_FLAGS -d \"$SIMULATOR\" --no-pub --dart-define=CI=true
+    flutter test integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart $FLUTTER_COMMAND_FLAGS -d \"$SIMULATOR\" --dart-define=CI=true
   MELOS_EXIT_CODE=$?
   xcrun simctl shutdown "$SIMULATOR"
   exit $MELOS_EXIT_CODE
@@ -31,7 +31,7 @@ fi
 if [ "$ACTION" == "macos" ]
 then
   melos exec -c 1 --fail-fast --scope="$FLUTTERFIRE_PLUGIN_SCOPE_EXAMPLE" --dir-exists=test_driver -- \
-    flutter test integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart $FLUTTER_COMMAND_FLAGS -d macos --no-pub --dart-define=CI=true
+    flutter test integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart $FLUTTER_COMMAND_FLAGS -d macos --dart-define=CI=true
   exit
 fi
 
@@ -40,6 +40,6 @@ then
   melos bootstrap --scope="*firebase_core*" --scope="$FLUTTERFIRE_PLUGIN_SCOPE"
   chromedriver --port=4444 &
   melos exec -c 1 --scope="$FLUTTERFIRE_PLUGIN_SCOPE_EXAMPLE" --dir-exists=web -- \
-    flutter drive $FLUTTER_COMMAND_FLAGS --no-pub --verbose-system-logs --device-id=web-server --target=./integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart --driver=./test_driver/integration_test.dart --dart-define=CI=true
+    flutter drive $FLUTTER_COMMAND_FLAGS --verbose-system-logs --device-id=web-server --target=./integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart --driver=./test_driver/integration_test.dart --dart-define=CI=true
   exit
 fi

.gitignore

@@ -10,6 +10,7 @@
 .pub/
 .dart_tool/
 pubspec.lock
+pubspec_overrides.yaml
 flutter_export_environment.sh
 
 examples/all_plugins/pubspec.yaml

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "dart.runPubGetOnPubspecChanges": false,
+  "dart.runPubGetOnPubspecChanges": "always",
 }

.vscode/tasks.json

@@ -62,14 +62,14 @@
     {
       "label": "firestore -> test:e2e",
       "type": "shell",
-      "command": "melos exec -c 1 --scope=\"*cloud_firestore_example*\" --fail-fast --dir-exists=integration_test -- flutter drive --no-pub --target=./integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart",
+      "command": "melos exec -c 1 --scope=\"*cloud_firestore_example*\" --fail-fast --dir-exists=integration_test -- flutter drive --target=./integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart",
       "detail": "Run end-to-end testing for Android & iOS via `flutter drive` on the Firestore example application",
       "problemMatcher": []
     },
     {
       "label": "firestore -> test:e2e:web",
       "type": "shell",
-      "command": "melos exec -c 1 --scope=\"*cloud_firestore_example*\" --dir-exists=web --fail-fast --dir-exists=test_driver -- flutter drive --release -d chrome --no-pub --verbose-system-logs --browser-name=chrome --target=./integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart --driver=./test_driver/integration_test.dart",
+      "command": "melos exec -c 1 --scope=\"*cloud_firestore_example*\" --dir-exists=web --fail-fast --dir-exists=test_driver -- flutter drive --release -d chrome --verbose-system-logs --browser-name=chrome --target=./integration_test/MELOS_PARENT_PACKAGE_NAME_e2e_test.dart --driver=./test_driver/integration_test.dart",
       "detail": "Run end-to-end testing for Web via `flutter drive` on the Firestore example application",
       "problemMatcher": []
     },

melos.yaml

@@ -2,8 +2,10 @@ name: FlutterFire
 repository: https://github.com/firebase/flutterfire
 
 packages:
-  - packages/**
-  - 'tests/*'
+  - packages/*
+  - packages/*/*
+  - packages/*/*/*
+  - tests
 
 command:
   version:
@@ -16,7 +18,7 @@ command:
 
     changelogs:
       - path: firebase_ui_changelog.md
-        packageFilters: 
+        packageFilters:
           scope: firebase_ui_*
         description: |
           All notable changes for firebase_ui packages
@@ -26,6 +28,7 @@ command:
     # https://github.com/dart-lang/pub/issues/3404). Disabling this feature
     # makes the CI much more stable.
     runPubGetInParallel: false
+    usePubspecOverrides: true
 
 scripts:
   lint:all:
@@ -64,23 +67,19 @@ scripts:
     run: |
       melos run build:example_ios_pub --no-select && \
       melos run build:example_android_pub --no-select && \
-      melos run build:example_macos --no-select && \
-      melos bootstrap
+      melos run build:example_macos --no-select
     description: Build all example apps.
 
   build:example_android:
     run: |
       melos exec -c 6 --fail-fast -- \
-        "flutter build apk --no-pub"
+        "flutter build apk"
     description: Build a specific example app for Android.
     select-package:
       dir-exists:
         - android
       scope: '*example*'
 
-  # melos bootstrap does not generate all files generated by a build that runs
-  # `pub get`, and `flutter drive` does not either, so it is still necessary to
-  # build sometimes without the `--no-pub` switch. Careful: `melos bootstrap` after.
   build:example_android_pub:
     run: |
       melos exec -c 6 --fail-fast -- \
@@ -94,16 +93,13 @@ scripts:
   build:example_ios:
     run: |
       melos exec -c 6 --fail-fast -- \
-        "flutter build ios --no-codesign --no-pub"
+        "flutter build ios --no-codesign"
     description: Build a specific example app for iOS.
     select-package:
       dir-exists:
         - ios
       scope: '*example*'
 
-  # melos bootstrap does not generate all files generated by a build that runs
-  # `pub get`, and `flutter drive` does not either, so it is still necessary to
-  # build sometimes without the `--no-pub` switch. Careful: `melos bootstrap` after.
   build:example_ios_pub:
     run: |
       melos exec -c 6 --fail-fast -- \
@@ -117,7 +113,7 @@ scripts:
   build:example_macos:
     run: |
       melos exec -c 6 --fail-fast -- \
-        "flutter build macos --no-pub"
+        "flutter build macos"
     description: |
       Build a specific example app for macOS.
     select-package:
@@ -136,7 +132,7 @@ scripts:
   test:
     run: |
       melos exec -c 6 --fail-fast -- \
-        "flutter test --no-pub"
+        "flutter test"
     description: Run `flutter test` for a specific package.
     select-package:
       dir-exists:
@@ -149,7 +145,7 @@ scripts:
   test:web:
     run: |
       melos exec -c 1 --fail-fast -- \
-        "flutter test --no-pub --platform=chrome"
+        "flutter test --platform=chrome"
     description: Run `flutter test --platform=chrome` for a specific '*web' package.
     select-package:
       dir-exists:
@@ -159,7 +155,7 @@ scripts:
   test:e2e:
     run: |
       melos exec -c 1 --fail-fast -- \
-        "flutter test integration_test/e2e_test.dart --no-pub"
+        "flutter test integration_test/e2e_test.dart"
     description: |
       Run all e2e tests.
     select-package:
@@ -170,7 +166,7 @@ scripts:
   test:e2e:web:
     run: |
       melos exec -c 1 --fail-fast -- \
-        "flutter drive --no-pub --target=./integration_test/e2e_test.dart --driver=./test_driver/integration_test.dart -d chrome"
+        "flutter drive --target=./integration_test/e2e_test.dart --driver=./test_driver/integration_test.dart -d chrome"
     description: |
       Run all e2e tests on web platform. Please ensure you have "chromedriver" installed and running.
     select-package:
@@ -292,6 +288,8 @@ scripts:
         --ignore "**/FlutterMultiDexApplication.java" \
         --ignore "**/GeneratedPluginRegistrant.swift" \
         --ignore "**/Pods/**" \
+        --ignore "**/flutter/generated_plugin_registrant.h" \
+        --ignore "**/flutter/generated_plugin_registrant.cc" \
         .
     description: Add a license header to all necessary files.
 
@@ -325,5 +323,7 @@ scripts:
         --ignore "**/FlutterMultiDexApplication.java" \
         --ignore "**/GeneratedPluginRegistrant.swift" \
         --ignore "**/Pods/**" \
+        --ignore "**/flutter/generated_plugin_registrant.h" \
+        --ignore "**/flutter/generated_plugin_registrant.cc" \
         .
     description: Add a license header to all necessary files.

packages/cloud_firestore/cloud_firestore/example/pubspec.yaml

@@ -6,28 +6,12 @@ environment:
   flutter: '>=1.12.13+hotfix.4'
 
 dependencies:
-  cloud_firestore:
-    path: ../
-  firebase_core:
-    path: ../../../firebase_core/firebase_core
+  cloud_firestore: any
+  firebase_core: any
   flutter:
     sdk: flutter
   http: ^0.13.3
 
-dependency_overrides:
-  _flutterfire_internals:
-    path: ../../../_flutterfire_internals
-  cloud_firestore_platform_interface:
-    path: ../../cloud_firestore_platform_interface
-  cloud_firestore_web:
-    path: ../../cloud_firestore_web
-  firebase_core:
-    path: ../../../firebase_core/firebase_core
-  firebase_core_platform_interface:
-    path: ../../../firebase_core/firebase_core_platform_interface
-  firebase_core_web:
-    path: ../../../firebase_core/firebase_core_web
-
 dev_dependencies:
   integration_test:
     sdk: flutter

packages/cloud_firestore_odm/cloud_firestore_odm/example/pubspec.yaml

@@ -6,12 +6,9 @@ environment:
   sdk: ">=2.16.0 <3.0.0"
 
 dependencies:
-  cloud_firestore:
-    path: ../../../cloud_firestore/cloud_firestore
-  cloud_firestore_odm:
-    path: ../../cloud_firestore_odm
-  firebase_core:
-    path: ../../../firebase_core/firebase_core
+  cloud_firestore: any
+  cloud_firestore_odm:  any
+  firebase_core: any
   flutter:
     sdk: flutter
   freezed_annotation: ^2.0.0
@@ -20,10 +17,8 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.0.0
-  cloud_firestore_odm_generator:
-    path: ../../cloud_firestore_odm_generator
-  cloud_firestore_odm_generator_integration_test:
-    path: ../../cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test
+  cloud_firestore_odm_generator: any
+  cloud_firestore_odm_generator_integration_test: any
   flutter_test:
     sdk: flutter
   freezed: ^2.0.0
@@ -33,27 +28,5 @@ dev_dependencies:
   json_serializable: ^6.3.0
   mockito: ^5.0.0
 
-dependency_overrides:
-  _flutterfire_internals:
-    path: ../../../_flutterfire_internals
-  cloud_firestore:
-    path: ../../../cloud_firestore/cloud_firestore
-  cloud_firestore_odm:
-    path: ../../cloud_firestore_odm
-  cloud_firestore_odm_generator:
-    path: ../../cloud_firestore_odm_generator
-  cloud_firestore_odm_generator_integration_test:
-    path: ../../cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test
-  cloud_firestore_platform_interface:
-    path: ../../../cloud_firestore/cloud_firestore_platform_interface
-  cloud_firestore_web:
-    path: ../../../cloud_firestore/cloud_firestore_web
-  firebase_core:
-    path: ../../../firebase_core/firebase_core
-  firebase_core_platform_interface:
-    path: ../../../firebase_core/firebase_core_platform_interface
-  firebase_core_web:
-    path: ../../../firebase_core/firebase_core_web
-
 flutter:
   uses-material-design: true

packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/pubspec.yaml

@@ -7,8 +7,7 @@ environment:
 
 dependencies:
   cloud_firestore: ^4.3.1
-  cloud_firestore_odm:
-    path: ../../cloud_firestore_odm
+  cloud_firestore_odm: any
   flutter:
     sdk: flutter
   freezed_annotation: ^2.0.0
@@ -17,26 +16,11 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.0.0
-  cloud_firestore_odm_generator:
-    path: ../../cloud_firestore_odm_generator
+  cloud_firestore_odm_generator: any
   flutter_test:
     sdk: flutter
   freezed: ^2.0.0
   json_serializable: ">=6.3.0 <7.0.0"
 
-dependency_overrides:
-  _flutterfire_internals:
-    path: ../../../_flutterfire_internals
-  cloud_firestore:
-    path: ../../../cloud_firestore/cloud_firestore
-  cloud_firestore_odm:
-    path: ../../cloud_firestore_odm
-  cloud_firestore_odm_generator:
-    path: ../../cloud_firestore_odm_generator
-  cloud_firestore_platform_interface:
-    path: ../../../cloud_firestore/cloud_firestore_platform_interface
-  cloud_firestore_web:
-    path: ../../../cloud_firestore/cloud_firestore_web
-
 flutter:
   uses-material-design: false