Skip to content

Conversation

@vimanyu
Copy link
Contributor

@vimanyu vimanyu commented May 11, 2021

Script that updates versions of iOS Cocoapods and Android packages across various files in the repository,

  • ios_pods/Podfile
  • <firebase_product>/integration_tests/Podfile
  • <firebase_product>/integration_tests_internal/Podfile
  • Android/firebase_dependencies.gradle
  • release_build_files/Android/firebase_dependencies.gradle
  • release_build_files/readme.md
  • */build.gradle

Simple usage of the script,
// To preview substitutions that will be made
python3 scripts/update_ios_android_dependencies.py --dryrun

// Update versions in default set of files in the repository
python3 scripts/update_ios_android_dependencies.py

For the scripts to work correctly, this PR had to be undone and older release notes format had to be restored. In the older format, there was atmost one dependency (pod or android package) specified per line and this made it way easier to read and process for regex substitutions.

For testing, I created a duplicate test branch and "zeroed" out all versions and ran the script. Here is the commit with the changes,
887da08

Also, Firebase/AdMob Cocoapod is now updated to Google-Mobile-Ads-SDK Cocoapod in the readme.

@vimanyu vimanyu requested review from DellaBitta and jonsimantov May 11, 2021 02:11
@vimanyu vimanyu self-assigned this May 11, 2021
@google-cla google-cla bot added the cla: yes label May 11, 2021
@jonsimantov
Copy link
Contributor

jonsimantov commented May 11, 2021

Script that updates versions of iOS Cocoapods and Android packages across various files in the repository,

  • ios_pods/Podfile
  • <firebase_product>/integration_tests/Podfile
  • Android/firebase_dependencies.gradle
  • build_release_notes/readme.md

I didn't read through the PR yet, but it should also update release_build_files/Android/firebase_dependencies.gradle and product/integration_test_internal/Podfile - if it does that already, you should update the PR description. :)

@sunmou99
Copy link
Contributor

sunmou99 commented May 11, 2021

As the iOS dependencies got updated at the same time.

  • ios_pods/Podfile
  • <firebase_product>/integration_tests/Podfile

I believe it's safe to remove the file and code here:
https://github.com/firebase/firebase-cpp-sdk/blob/main/scripts/gha/integration_testing/update_podfile.py
https://github.com/firebase/firebase-cpp-sdk/blob/main/scripts/gha/build_testapps.py#L521
(These codes are trying to fix iOS dependencies inconsistency.)

@vimanyu
Copy link
Contributor Author

vimanyu commented May 11, 2021

Script that updates versions of iOS Cocoapods and Android packages across various files in the repository,

  • ios_pods/Podfile
  • <firebase_product>/integration_tests/Podfile
  • Android/firebase_dependencies.gradle
  • build_release_notes/readme.md

I didn't read through the PR yet, but it should also update release_build_files/Android/firebase_dependencies.gradle and product/integration_test_internal/Podfile - if it does that already, you should update the PR description. :)

Awesome. Thanks for catching this. I didn't realize there was another firebase_dependencies file in the repo.
For Podfiles, I am recursively searching through the repo. So integration_tests_internal were being handled. Had to add android dependency file separately though.

@vimanyu
Copy link
Contributor Author

vimanyu commented May 11, 2021

I believe it's safe to remove the file and code here:
https://github.com/firebase/firebase-cpp-sdk/blob/main/scripts/gha/integration_testing/update_podfile.py
https://github.com/firebase/firebase-cpp-sdk/blob/main/scripts/gha/build_testapps.py#L521
(These codes are trying to fix iOS dependencies inconsistency.)

Great point Mou! I will handle the cleanup of these files (and corresponding code) in a separate PR and add you as a reviewer.

@vimanyu vimanyu requested a review from sunmou99 May 11, 2021 21:34
sunmou99
sunmou99 previously approved these changes May 19, 2021
Copy link
Contributor

@sunmou99 sunmou99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

DellaBitta
DellaBitta previously approved these changes May 20, 2021
Copy link
Contributor

@DellaBitta DellaBitta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved with some nits.

@vimanyu vimanyu dismissed stale reviews from DellaBitta and sunmou99 via 739e8b0 May 20, 2021 18:48
@vimanyu vimanyu requested review from DellaBitta and sunmou99 May 20, 2021 19:53
sunmou99
sunmou99 previously approved these changes May 20, 2021
Copy link
Contributor

@alexames alexames left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought my comments went in yesterday but I guess I didn't hit the submit button.

@vimanyu vimanyu merged commit 64b0461 into main May 21, 2021
@vimanyu vimanyu deleted the feature/python-scripts-update-ios-android-dependencies branch May 21, 2021 00:56
@firebase firebase locked and limited conversation to collaborators Jun 20, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

5 participants