Fix and rewrite sync_project.rb #3296
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ever since we added multiple platforms, removing a file has been broken. This fixes that issue. Also, rewrite target synchronization to make more sense. Essentially now there's one diff between the filesystem and the groups and then an explicit diff is done between project files and target contents.
| if SOURCES.include?(ext) | ||
| return target.source_build_phase | ||
| elsif HEADERS.include?(ext) | ||
| #return target.headers_build_phase |
There was a problem hiding this comment.
I assume we should remove the commented out code here and directly below.
There was a problem hiding this comment.
I've added TODOs to make it clearer that this is forthcoming.
scripts/sync_project.rb
Outdated
| # e.g. "Supporting Files" or "en.lproj" which either act as aliases for the | ||
| # parent or are folders that are omitted from the project view. Processing the | ||
| # diff this way allows these warts to be tolerated, even if they won't | ||
| # necessarily be recreated if an artifact is added to the filesystem. |
There was a problem hiding this comment.
Nit: I find this comment really hard to parse. If you don't feel like rewriting it, I suggest to add some commas or dashes to break out the different sections here.
There was a problem hiding this comment.
I rewrote the comment, focusing less on the low-level details of traversal, and more on the high-level intent, which is to ignore where in the group structure a file reference actually occurs, which preserves the seemingly arbitrary groupings in the default project structure.
schmidt-sebastian
approved these changes
Jul 8, 2019
|
Travis shows all tests passing but Travis isn't updating the PR. |
mikehaney24
added a commit
that referenced
this pull request
Jul 10, 2019
* Create travis jobs for FirebaseCoreDiagnostics And update the pod lib lints for GDT. Remove the mph-master branch before merging to master. * Add support for FIRCD to if_changed.sh * Adjust tests * Unavailable init methods should not be nullable (#3276) * Allow firestore api to work with Codable objects + ExplicitNull + Integration tests (#3261) * Convinience api for codables * Integration Tests * ExplicitNull implementation * Update to CocoaPods 1.7.3 (#3280) * Import GULLoggerLevel.h via public framework header (#3277) * Put the need to include Firestore/Source/Public in the podspec (#3288) This removes the need to munge the pods project after the fact and makes it so that customers can click through to our headers too. * Ensure Storage initializer doesn't get called (#3294) * FIROptions.appGroupID introduced (#3293) * Use a consistent set of dependencies on all platforms (#3289) * Use a consistent set of dependencies on all platforms * pod install for uniform dependencies * Store the coerced base value in the BaseMutation (#3292) * In card message: set the text color on the body text view (#3286) * In card message: set the text color on the body text view * Fix bug where card messages in test app were showing up with two of the same buttons * Revert change to text color * [docs] add missing semicolon (#3305) Add missing semicolon to code example * Add explicit Foundation import. (#3309) This is causing issues when building an XCFramework. * Pass the correct compiler flag for CoreDiagnostics. (#3312) * Pass the correct compiler flag for CoreDiagnostics. When CoreDiagnostics is open sourced, we'll need to ensure that the right compiler flag is passed. This doesn't add support for Carthage yet but allows the frameworkbuilder to pass the flag for carthage as well. An update to the zipbuilder to allow for carthage will follow shortly. * Remove accidental change. * Fix and rewrite sync_project.rb (#3296) * Fix and rewrite sync_project.rb Ever since we added multiple platforms, removing a file has been broken. This fixes that issue. Also, rewrite target synchronization to make more sense. Essentially now there's one diff between the filesystem and the groups and then an explicit diff is done between project files and target contents. * Run sync_project.rb on post-install * pod lib linting should output something every minute while running * DEBUG: This commit should be reverted * DEBUG: This commit should be reverted * DEBUG: This commit should be reverted
mikehaney24
added a commit
that referenced
this pull request
Jul 18, 2019
* Implement CoreDiagnostics interop For use by FirebaseCore. Please pay special attention to the changes in FIRApp, I've replaced passing FIRApp in the notification with a data object that will eventually replace the same information that FIRDiagnostics extracted. * Add CoreDiagnosticsInterop to the Example Podfile * Style and xcodeproj updates * Update Podfiles that dep on FirebaseCore So that they also have a dep on FirebaseCoreDiagnosticsInterop * ran pod deintegrate to remove unintended xcodeproj changes * Fix Podfile paths * Add FCD to if_changed and travis.yml * Fix building with Firestore * Style * Whitespace * Fix a changed internal API * Make pod paths consistent * Restore connectivity_monitor_noop.cc style * Remove logging prior to [FIRApp configure] Also remove sendLogsWithServiceName:version: * style * Remove nil checks from diagnostics data * Put back some deleted symbols * Restore the sendLogsWithServiceName:version: method, but as a no-op * Restore the original version of sendLogs... * Allow an unused parameter * Remove obsolete nsnotificationcenter related stuff * Whoops, missed the header change. * Final changes to support FIRCoreDiagnostics These changes are necessary because FIRCore has a hard dep on FIRCoreDiagnostics (FIRCD) and FIRCoreDiagnosticsInterop. Components can't be used because FIRCD would need to have a hard dep on FIRCore to get access to FIRLibrary, FIRComponent, FIRComponentContainer, and FIRComponentCreationBlock and this would create a dep cycle. So, an extern has been put into the interop lib and the variable is implemented in the connector class inside of FIRCore, but it's unset. FIRCD actually sets that variable in +load, allowing use of FIRCD. FIRCD can also be removed as a dependency with no ill effect by end users setting the environment variable DISABLE_FIREBASE_DIAGNOSTICS=1 * Add nanopb and project generation infrastructure * Convert FIRCoreDiagnostics to canonical nanopb, and move to OSS. * Remove custom build steps for CoreDiagnostics * Addressing review comments * Update versions, tags, and port the relevant unit tests for FIRCD * Version and platform fixes * Fix podspec expected tags * A hack to solve a chicken-and-egg problem with pod lib linting. * Heartbeat implementation * FIRDiagnosticsDateFileStorageTests * Fix tests for non-iOS platforms * Heartbeat tests * Fix initialization. * Cleanup Installation ID. * Fix testProtoPopulation. * Merge conflict fix * Typo fix. * Remove FIRCore dep from FIRCD unit tests and move symbols to interop * Run ./scripts/style.sh * Typo * #ifdef comment * File license header. * Import FIRDiagnosticsDateFileStorage.h using relative path. * FIRDiagnostics -> FIRCoreDiagnostics * Docs syntax * Docs * Docs typo * Add shared variables to the interop lib I know this goes against the convention, but it's actually the only way to resolve this very unique problem. * Fix comment * Style * Removed lib version passing. * Remove env checking for conditional deps * Style * Address whitespace issues * Add copyright notice * Add new deps to Podfiles * Fix trailing space * Some changes to fix working in an extension. * Fix type in Podfile * GDT: begin/end background task only for iOS and TVOS applications. * Fix typo * Style * Stop sharing kFIRService strings across pods * Travis test * Change all TARGET_OS_TVOS macros to TARGET_OS_TV TARGET_OS_TVOS doesn't exist. Also macro out a UIApplication reference. * style * Update all Podfiles with deps on FIRCore * Fix trailing whitespace * Update Firestore cmake * Fix FIAM build break (#3254) * Additional cmake changes * Fix linker issue with deprecated CoreDiagnostics (#3257) * Adding more deps to cmake * Fix linker error (#3266) * Rerun only IAM tests * whitespace * No xcpretty or frameworks run * Fix typo * Revert "No xcpretty or frameworks run" This reverts commit afc1abb. * Revert "whitespace" This reverts commit fd06955. * Revert "Rerun only IAM tests" This reverts commit 98ce076. * Run travis on this branch * Add support for expanding PODS_TARGET_SRCROOT in CMake (#3267) * Fix a few things that should have been splatted but weren't * Define PODS_TARGET_SRCROOT in CMake for compatibility with CocoaPods * Compile pods we depend upon with looser settings * Rename the nanopb dependency to match what CMake actually has * Make #include <nanopb/pb.h> work Remove the old way of #include <pb.h> once we change the Firestore nanopb generator to match. * Fix warnings that fail the build * Remove typed enum and fix a comment. * Fix an import * Change a line so it's not altered by Copybara * More changes to stop copybara from altering the wrong sources * Remove trailing whitespace * Fix copybara modifying python. * Add additional field in firebasecore.proto (#3273) * Remove the dependency on interop to populate a shared variable. * style * Create travis jobs for FirebaseCoreDiagnostics (#3245) * Create travis jobs for FirebaseCoreDiagnostics And update the pod lib lints for GDT. Remove the mph-master branch before merging to master. * Add support for FIRCD to if_changed.sh * Adjust tests * Unavailable init methods should not be nullable (#3276) * Allow firestore api to work with Codable objects + ExplicitNull + Integration tests (#3261) * Convinience api for codables * Integration Tests * ExplicitNull implementation * Update to CocoaPods 1.7.3 (#3280) * Import GULLoggerLevel.h via public framework header (#3277) * Put the need to include Firestore/Source/Public in the podspec (#3288) This removes the need to munge the pods project after the fact and makes it so that customers can click through to our headers too. * Ensure Storage initializer doesn't get called (#3294) * FIROptions.appGroupID introduced (#3293) * Use a consistent set of dependencies on all platforms (#3289) * Use a consistent set of dependencies on all platforms * pod install for uniform dependencies * Store the coerced base value in the BaseMutation (#3292) * In card message: set the text color on the body text view (#3286) * In card message: set the text color on the body text view * Fix bug where card messages in test app were showing up with two of the same buttons * Revert change to text color * [docs] add missing semicolon (#3305) Add missing semicolon to code example * Add explicit Foundation import. (#3309) This is causing issues when building an XCFramework. * Pass the correct compiler flag for CoreDiagnostics. (#3312) * Pass the correct compiler flag for CoreDiagnostics. When CoreDiagnostics is open sourced, we'll need to ensure that the right compiler flag is passed. This doesn't add support for Carthage yet but allows the frameworkbuilder to pass the flag for carthage as well. An update to the zipbuilder to allow for carthage will follow shortly. * Remove accidental change. * Fix and rewrite sync_project.rb (#3296) * Fix and rewrite sync_project.rb Ever since we added multiple platforms, removing a file has been broken. This fixes that issue. Also, rewrite target synchronization to make more sense. Essentially now there's one diff between the filesystem and the groups and then an explicit diff is done between project files and target contents. * Run sync_project.rb on post-install * pod lib linting should output something every minute while running * DEBUG: This commit should be reverted * DEBUG: This commit should be reverted * DEBUG: This commit should be reverted * Remove mph-master from travis * Fix constant name conflic between old and new diagnostics (#3329) * Rename kFIRDiagnosticsHeartbeatDateFileName -> kFIRCoreDiagnosticsHeartbeatDateFileName to avoid conflicts with FIRDiagnostics. * Travis: temporary add `mph-master` to run tests. * Rempve mph-master again * Fix imports in FIRCDConnector * Fix another import * Fix yet another import * Attempt to read crashing test logs from disk * Implement printing of failed/crashed test logs. * Print only crashed tests, rmdir between runs * Revert reading crashing log changes * Write CHANGELOG for all new FIRCD associated libraries * Change all GUL deps to >= 6.2 * Revert ZipBuilder changes and do some last bits of cleanup * Remove an assertion and populate an error instead
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ever since we added multiple platforms, removing a file has been broken. It succeeds for the first platform and then fails on a subsequent one. This fixes that issue.
Also, rewrite target synchronization to make more sense. Essentially now there's one diff between the filesystem and the groups and then an explicit diff is done between project files and target contents.