From 1bfabd022c8c87e162d945b471efa675a01a8af8 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 4 Mar 2021 20:19:10 -0800 Subject: [PATCH 01/13] fix version error --- .../extension_google_sign_in_as_googleapis_auth/CHANGELOG.md | 4 ++++ .../extension_google_sign_in_as_googleapis_auth/pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md index 5e29f340599b..837c017cf7b3 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.1 + +* Bump min Flutter version to 2.0.0. + ## 2.0.0 * Migrate to null safety. diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml index 7d86b67196d0..412fabfafb78 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml @@ -6,7 +6,7 @@ name: extension_google_sign_in_as_googleapis_auth description: A bridge package between google_sign_in and googleapis_auth, to create Authenticated Clients from google_sign_in user credentials. -version: 2.0.0 +version: 2.0.1 homepage: https://github.com/flutter/plugins/google_sign_in/extension_google_sign_in_as_googleapis_auth dependencies: @@ -25,4 +25,4 @@ dev_dependencies: environment: sdk: ">=2.12.0-259.9.beta <3.0.0" - flutter: ">=1.12.13+hotfix.4" + flutter: ">=2.0.0" From 6a3179852d203c697a7b87249ddef082aa34d21e Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 4 Mar 2021 20:21:53 -0800 Subject: [PATCH 02/13] Revert "fix version error" This reverts commit 1bfabd022c8c87e162d945b471efa675a01a8af8. --- .../extension_google_sign_in_as_googleapis_auth/CHANGELOG.md | 4 ---- .../extension_google_sign_in_as_googleapis_auth/pubspec.yaml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md index 837c017cf7b3..5e29f340599b 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.0.1 - -* Bump min Flutter version to 2.0.0. - ## 2.0.0 * Migrate to null safety. diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml index 412fabfafb78..7d86b67196d0 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/pubspec.yaml @@ -6,7 +6,7 @@ name: extension_google_sign_in_as_googleapis_auth description: A bridge package between google_sign_in and googleapis_auth, to create Authenticated Clients from google_sign_in user credentials. -version: 2.0.1 +version: 2.0.0 homepage: https://github.com/flutter/plugins/google_sign_in/extension_google_sign_in_as_googleapis_auth dependencies: @@ -25,4 +25,4 @@ dev_dependencies: environment: sdk: ">=2.12.0-259.9.beta <3.0.0" - flutter: ">=2.0.0" + flutter: ">=1.12.13+hotfix.4" From ae8ca9540fa27996b59d7ecf6d1aa3682431b469 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 4 Mar 2021 20:22:51 -0800 Subject: [PATCH 03/13] remove flutter driver dep --- .../example/pubspec.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml index d3b428d190c9..c96ca065f081 100755 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml @@ -16,10 +16,6 @@ dependencies: dev_dependencies: pedantic: ^1.10.0 - integration_test: - path: ../../../integration_test - flutter_driver: - sdk: flutter flutter: uses-material-design: true From d943bc391983406c56d29e9d7ae477fa557671f4 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 09:26:07 -0800 Subject: [PATCH 04/13] exclude google sign in web in stable analyze --- .cirrus.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index ea27c88b97e0..dbe1c983387e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,10 +37,16 @@ task: test_script: - flutter channel $CHANNEL - ./script/incremental_build.sh test - - name: analyze + - name: analyze_master env: matrix: CHANNEL: "master" + script: + - flutter channel $CHANNEL + - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" + - name: analyze_stable + env: + matrix: CHANNEL: "stable" script: - flutter channel $CHANNEL From 131b5cb0e6b93f18af44cca40564630b259c339c Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Fri, 5 Mar 2021 10:40:03 -0800 Subject: [PATCH 05/13] Update .cirrus.yml --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index dbe1c983387e..26e8f7408e0d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -43,14 +43,14 @@ task: CHANNEL: "master" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" + - ./script/incremental_build.sh analyze - name: analyze_stable env: matrix: CHANNEL: "stable" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze + - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" ### Android tasks ### - name: build_all_plugins_apk env: From dab930e05e62086bcd18035a0624cab2115e9d59 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 10:40:11 -0800 Subject: [PATCH 06/13] Chris exclude stable please --- .cirrus.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index dbe1c983387e..13ba99cfbf25 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -43,14 +43,16 @@ task: CHANNEL: "master" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" + - ./script/incremental_build.sh analyze + ## TODO(cyanglaz): + ## Combing stable and master analyze jobs when integration test null safety is ready on flutter stable. - name: analyze_stable env: matrix: CHANNEL: "stable" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze + - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" ### Android tasks ### - name: build_all_plugins_apk env: From 2fb015a9159914abb405461424c7235d6f446c09 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 10:44:17 -0800 Subject: [PATCH 07/13] merge confclits --- .cirrus.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 09e109401746..76349fbcc7c7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -44,22 +44,15 @@ task: script: - flutter channel $CHANNEL - ./script/incremental_build.sh analyze -<<<<<<< HEAD ## TODO(cyanglaz): ## Combing stable and master analyze jobs when integration test null safety is ready on flutter stable. -======= ->>>>>>> 131b5cb0e6b93f18af44cca40564630b259c339c - name: analyze_stable env: matrix: CHANNEL: "stable" script: - flutter channel $CHANNEL -<<<<<<< HEAD - - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" -======= - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" ->>>>>>> 131b5cb0e6b93f18af44cca40564630b259c339c ### Android tasks ### - name: build_all_plugins_apk env: From 1ba53df9c7cfe99cc1d63f3ab7e9fcc28c98b005 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 10:56:22 -0800 Subject: [PATCH 08/13] exclude all webs --- .cirrus.yml | 2 +- script/incremental_build.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 76349fbcc7c7..a93c8fe9dbd2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,7 +52,7 @@ task: CHANNEL: "stable" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze --exclude "google_sign_in_web" + - ./script/incremental_build.sh analyze --exclude "google_sign_in_web, connectivity_for_web, file_selector_web, google_maps_flutter_web, url_launcher_web" ### Android tasks ### - name: build_all_plugins_apk env: diff --git a/script/incremental_build.sh b/script/incremental_build.sh index 826229bced60..bf7fc10cfab2 100755 --- a/script/incremental_build.sh +++ b/script/incremental_build.sh @@ -48,7 +48,9 @@ else (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) else echo running "${ACTIONS[@]}" - (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) + (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) + + # (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) echo "Running version check for changed packages" # TODO(egarciad): Enable this check once in master. # (cd "$REPO_DIR" && $PUB global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)") From 35965f5ff97922a976e0f2fb9a0af8d6352afdf6 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 11:38:04 -0800 Subject: [PATCH 09/13] Update .cirrus.yml Co-authored-by: David Iglesias --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index a93c8fe9dbd2..c260882dc2cc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,7 +52,8 @@ task: CHANNEL: "stable" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze --exclude "google_sign_in_web, connectivity_for_web, file_selector_web, google_maps_flutter_web, url_launcher_web" + - find . -type d -wholename '*_web/example' -exec rm -rf {} \; # Remove web example dirs + - ./script/incremental_build.sh analyze ### Android tasks ### - name: build_all_plugins_apk env: From 500a079eaa03f48ba6414d8a38c49dfa3b7f73a8 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 12:19:08 -0800 Subject: [PATCH 10/13] revert to exclude --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c260882dc2cc..a93c8fe9dbd2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,8 +52,7 @@ task: CHANNEL: "stable" script: - flutter channel $CHANNEL - - find . -type d -wholename '*_web/example' -exec rm -rf {} \; # Remove web example dirs - - ./script/incremental_build.sh analyze + - ./script/incremental_build.sh analyze --exclude "google_sign_in_web, connectivity_for_web, file_selector_web, google_maps_flutter_web, url_launcher_web" ### Android tasks ### - name: build_all_plugins_apk env: From 972b610f1ca79b3faba62e1b9d6e808ca3f33347 Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Fri, 5 Mar 2021 14:06:27 -0800 Subject: [PATCH 11/13] Update .cirrus.yml Remove web examples before running analyze in stable. Don't attempt to build web examples in stable. --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index a93c8fe9dbd2..eac32d114269 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,7 +52,8 @@ task: CHANNEL: "stable" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze --exclude "google_sign_in_web, connectivity_for_web, file_selector_web, google_maps_flutter_web, url_launcher_web" + - find . -depth -type d -wholename '*_web/example' -exec rm -rf {} \; + - ./script/incremental_build.sh analyze ### Android tasks ### - name: build_all_plugins_apk env: @@ -75,7 +76,6 @@ task: env: matrix: CHANNEL: "master" - CHANNEL: "stable" build_script: - flutter channel $CHANNEL - ./script/incremental_build.sh build-examples --web From fcc2e065a996b53a1aa915fcec3af06a7cffd9b1 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 14:08:21 -0800 Subject: [PATCH 12/13] remove space in exclude --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index a93c8fe9dbd2..8330013db8c3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,7 +52,7 @@ task: CHANNEL: "stable" script: - flutter channel $CHANNEL - - ./script/incremental_build.sh analyze --exclude "google_sign_in_web, connectivity_for_web, file_selector_web, google_maps_flutter_web, url_launcher_web" + - ./script/incremental_build.sh analyze --exclude "google_sign_in_web,connectivity_for_web,file_selector_web,google_maps_flutter_web,url_launcher_web" ### Android tasks ### - name: build_all_plugins_apk env: From 7610ff0b1a86f06dd7a6bca82bd70b4a227131d7 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Mar 2021 15:41:24 -0800 Subject: [PATCH 13/13] revert the testing code in incremental build --- script/incremental_build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/script/incremental_build.sh b/script/incremental_build.sh index bf7fc10cfab2..826229bced60 100755 --- a/script/incremental_build.sh +++ b/script/incremental_build.sh @@ -48,9 +48,7 @@ else (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) else echo running "${ACTIONS[@]}" - (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) - - # (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) + (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]}) echo "Running version check for changed packages" # TODO(egarciad): Enable this check once in master. # (cd "$REPO_DIR" && $PUB global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)")