Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Firestore] Consolidate Firestore and FirestoreSwift (Post-Rollback) #11954

Merged
merged 10 commits into from
Oct 19, 2023

Conversation

ncooke3
Copy link
Member

@ncooke3 ncooke3 commented Oct 17, 2023

Context

In this revised approach, I created a FirebaseFirestoreInternal.podspec that contains the ObjC/C++/ObjC++ contents of Firestore. Then, the FirebaseFirestore.podspec is now responsible for containing the Swift Firestore API and the re-exporting the public Objective-C API from FirebaseFirestoreInternal. Last, the FirebaseFirestoreInternal re-exports API that used to live within it. It also throws a warning.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 17, 2023

Apple API Diff Report

Commit: d15ad50
Last updated: Thu Oct 19 11:45 PDT 2023
View workflow logs & download artifacts


[BUILD ERROR] FirebaseFirestoreSwift


@google-oss-bot
Copy link

google-oss-bot commented Oct 17, 2023

Coverage Report 1

Affected Products

  • FirebaseFirestore-iOS-FirebaseFirestore.framework

    Overall coverage changed from ? (770776d) to 40.71% (d15ad50) by ?.

    23 individual files with coverage change

    FilenameBase (770776d)Merge (d15ad50)Diff
    CodablePassThroughTypes.swift?100.00%?
    CollectionReference+AsyncAwait.swift?96.88%?
    CollectionReference+WriteEncodable.swift?100.00%?
    DocumentID.swift?86.44%?
    DocumentReference+Codable.swift?50.00%?
    DocumentReference+ReadDecodable.swift?0.00%?
    DocumentReference+WriteEncodable.swift?100.00%?
    DocumentSnapshot+ReadDecodable.swift?80.00%?
    EncoderDecoder.swift?100.00%?
    ExplicitNull.swift?90.48%?
    FieldValue+Encodable.swift?100.00%?
    Firestore+AsyncAwait.swift?97.75%?
    FirestoreQuery.swift?0.00%?
    FirestoreQueryObservable.swift?0.00%?
    GeoPoint+Codable.swift?100.00%?
    QueryPredicate.swift?0.00%?
    ServerTimestamp.swift?96.97%?
    SwiftHeaderWorkaround.swift?0.00%?
    Timestamp+Codable.swift?100.00%?
    TimestampDecodingStrategy.swift?100.00%?
    TimestampEncodingStrategy.swift?100.00%?
    Transaction+WriteEncodable.swift?100.00%?
    WriteBatch+WriteEncodable.swift?100.00%?

  • FirebaseFirestore-iOS-FirebaseFirestoreInternal.framework

    Overall coverage changed from ? (770776d) to 88.09% (d15ad50) by ?.

    229 individual files with coverage change

    FilenameBase (770776d)Merge (d15ad50)Diff
    aggregate_alias.cc?100.00%?
    aggregate_field.cc?100.00%?
    aggregate_query.cc?100.00%?
    aggregation_result.nanopb.cc?0.00%?
    any.nanopb.cc?0.00%?
    array_contains_any_filter.cc?100.00%?
    array_contains_filter.cc?100.00%?
    async_queue.cc?100.00%?
    auth_token.cc?100.00%?
    autoid.cc?100.00%?
    background_queue.cc?100.00%?
    bits.cc?100.00%?
    bloom_filter.cc?90.12%?
    bloom_filter.nanopb.cc?0.00%?
    bound.cc?84.29%?
    bundle.nanopb.cc?0.00%?
    bundle_loader.cc?95.65%?
    bundle_reader.cc?91.26%?
    bundle_serializer.cc?91.49%?
    byte_stream_apple.mm?86.36%?
    byte_stream_cpp.cc?83.33%?
    byte_string.cc?80.30%?
    collection_reference.cc?100.00%?
    common.nanopb.cc?34.48%?
    comparison.cc?100.00%?
    composite_filter.cc?90.10%?
    connectivity_monitor.cc?100.00%?
    connectivity_monitor_apple.mm?51.92%?
    converters.mm?100.00%?
    database_id.cc?65.38%?
    database_info.cc?100.00%?
    datastore.cc?96.69%?
    delete_mutation.cc?84.00%?
    direction.cc?76.92%?
    document.cc?0.00%?
    document.nanopb.cc?98.33%?
    document_change.cc?62.50%?
    document_key.cc?93.06%?
    document_key_reference.cc?65.00%?
    document_overlay_cache.cc?100.00%?
    document_reference.cc?100.00%?
    document_set.cc?87.30%?
    document_snapshot.cc?100.00%?
    empty.nanopb.cc?0.00%?
    error_apple.mm?92.31%?
    event_manager.cc?98.08%?
    exception.cc?23.68%?
    exception_apple.mm?96.55%?
    executor_libdispatch.mm?96.06%?
    executor_std.cc?97.71%?
    exponential_backoff.cc?100.00%?
    field_filter.cc?95.00%?
    field_index.cc?92.68%?
    field_mask.cc?100.00%?
    field_path.cc?98.17%?
    field_transform.cc?41.67%?
    filesystem_apple.mm?83.33%?
    filesystem_common.cc?81.67%?
    filesystem_posix.cc?81.82%?
    filter.cc?70.00%?
    FIRAggregateField.mm?98.41%?
    FIRAggregateQuery.mm?100.00%?
    FIRAggregateQuerySnapshot.mm?100.00%?
    FIRCollectionReference.mm?95.08%?
    FIRDocumentChange.mm?76.32%?
    FIRDocumentReference.mm?97.10%?
    FIRDocumentSnapshot.mm?97.89%?
    firebase_app_check_credentials_provider_apple.mm?92.93%?
    firebase_auth_credentials_provider_apple.mm?76.64%?
    firebase_metadata_provider_apple.mm?86.96%?
    firebase_metadata_provider_noop.cc?100.00%?
    firestore.cc?92.41%?
    firestore.nanopb.cc?35.95%?
    firestore_client.cc?98.94%?
    firestore_index_value_writer.cc?90.00%?
    FIRFieldPath.mm?90.24%?
    FIRFieldValue.mm?89.41%?
    FIRFilter.mm?100.00%?
    FIRFirestore.mm?89.02%?
    FIRFirestoreSettings.mm?81.00%?
    FIRFirestoreSource.mm?90.91%?
    FIRGeoPoint.mm?82.22%?
    FIRListenerRegistration.mm?100.00%?
    FIRLoadBundleTask.mm?80.70%?
    FIRLocalCacheSettings.mm?48.97%?
    FIRPersistentCacheIndexManager.mm?100.00%?
    FIRQuery.mm?87.87%?
    FIRQuerySnapshot.mm?95.45%?
    FIRSnapshotMetadata.mm?100.00%?
    FIRTimestamp.m?79.35%?
    FIRTransaction.mm?97.64%?
    FIRTransactionOptions.mm?100.00%?
    FIRWriteBatch.mm?100.00%?
    FSTFirestoreComponent.mm?95.74%?
    FSTUserDataReader.mm?95.38%?
    FSTUserDataWriter.mm?87.06%?
    geo_point.cc?65.00%?
    grpc_completion.cc?100.00%?
    grpc_connection.cc?77.50%?
    grpc_nanopb.cc?94.87%?
    grpc_root_certificate_finder_generated.cc?100.00%?
    grpc_stream.cc?99.01%?
    grpc_streaming_reader.cc?100.00%?
    grpc_unary_call.cc?100.00%?
    grpc_util.cc?100.00%?
    hard_assert.cc?100.00%?
    http.nanopb.cc?0.00%?
    index.nanopb.cc?0.00%?
    index_backfiller.cc?100.00%?
    index_entry.cc?60.00%?
    in_filter.cc?100.00%?
    json_reader.cc?87.50%?
    key_field_filter.cc?100.00%?
    key_field_in_filter.cc?100.00%?
    key_field_not_in_filter.cc?100.00%?
    latlng.nanopb.cc?86.67%?
    leveldb_bundle_cache.cc?76.00%?
    leveldb_document_overlay_cache.cc?97.17%?
    leveldb_index_manager.cc?97.73%?
    leveldb_key.cc?98.82%?
    leveldb_lru_reference_delegate.cc?95.93%?
    leveldb_migrations.cc?92.64%?
    leveldb_mutation_queue.cc?92.42%?
    leveldb_opener.cc?78.99%?
    leveldb_overlay_migration_manager.cc?100.00%?
    leveldb_persistence.cc?92.31%?
    leveldb_remote_document_cache.cc?96.55%?
    leveldb_target_cache.cc?94.68%?
    leveldb_transaction.cc?98.79%?
    leveldb_util.cc?71.43%?
    load_bundle_task.cc?97.06%?
    local_documents_view.cc?96.92%?
    local_serializer.cc?87.78%?
    local_store.cc?100.00%?
    local_view_changes.cc?100.00%?
    logic_utils.cc?97.94%?
    log_apple.mm?93.33%?
    lru_garbage_collector.cc?91.34%?
    maybe_document.nanopb.cc?28.89%?
    md5.cc?91.88%?
    memory_bundle_cache.cc?100.00%?
    memory_document_overlay_cache.cc?100.00%?
    memory_eager_reference_delegate.cc?100.00%?
    memory_index_manager.cc?51.61%?
    memory_lru_reference_delegate.cc?95.41%?
    memory_mutation_queue.cc?100.00%?
    memory_persistence.cc?97.37%?
    memory_remote_document_cache.cc?93.83%?
    memory_target_cache.cc?100.00%?
    message.cc?100.00%?
    mutable_document.cc?68.52%?
    mutation.cc?86.15%?
    mutation.nanopb.cc?75.76%?
    mutation_batch.cc?88.30%?
    mutation_batch_result.cc?52.17%?
    nanopb_util.cc?100.00%?
    not_in_filter.cc?100.00%?
    object_value.cc?100.00%?
    online_state_tracker.cc?100.00%?
    ordered_code.cc?94.39%?
    order_by.cc?50.00%?
    overlay.cc?100.00%?
    patch_mutation.cc?100.00%?
    path.cc?100.00%?
    persistent_cache_index_manager.cc?100.00%?
    precondition.cc?86.49%?
    pretty_printing.cc?83.33%?
    proto_sizer.cc?100.00%?
    query.cc?98.43%?
    query.nanopb.cc?67.92%?
    query_core.cc?95.80%?
    query_engine.cc?98.68%?
    query_listener.cc?100.00%?
    query_listener_registration.cc?100.00%?
    query_snapshot.cc?84.21%?
    reader.cc?100.00%?
    reference_set.cc?88.89%?
    remote_event.cc?97.75%?
    remote_objc_bridge.cc?92.96%?
    remote_store.cc?91.16%?
    resource.nanopb.cc?0.00%?
    resource_path.cc?100.00%?
    schedule.cc?100.00%?
    secure_random_arc4random.cc?100.00%?
    serializer.cc?91.00%?
    server_timestamp_util.cc?95.77%?
    settings.cc?83.11%?
    set_mutation.cc?89.13%?
    snapshots_in_sync_listener_registration.cc?100.00%?
    snapshot_metadata.cc?100.00%?
    snapshot_version.cc?85.71%?
    status.cc?73.05%?
    status.nanopb.cc?72.22%?
    statusor.cc?80.00%?
    status_apple.mm?96.61%?
    status_errno.cc?37.82%?
    stream.cc?98.83%?
    strerror.cc?100.00%?
    string_apple.cc?100.00%?
    string_format.cc?93.94%?
    string_util.cc?100.00%?
    struct.nanopb.cc?7.32%?
    sync_engine.cc?95.26%?
    target.cc?96.23%?
    target.nanopb.cc?45.00%?
    target_data.cc?43.04%?
    target_id_generator.cc?100.00%?
    target_index_matcher.cc?90.77%?
    task.cc?94.78%?
    testing_hooks.cc?100.00%?
    timestamp.cc?94.00%?
    timestamp.nanopb.cc?100.00%?
    timestamp_internal.cc?53.33%?
    transaction.cc?90.06%?
    transaction_runner.cc?100.00%?
    transform_operation.cc?77.03%?
    user.cc?100.00%?
    user_data.cc?96.30%?
    value_util.cc?95.71%?
    verify_mutation.cc?12.50%?
    view.cc?98.39%?
    view_snapshot.cc?78.99%?
    watch_change.cc?90.00%?
    watch_stream.cc?90.70%?
    wrappers.nanopb.cc?11.11%?
    write.nanopb.cc?60.57%?
    writer.cc?96.97%?
    write_batch.cc?91.89%?
    write_stream.cc?94.37%?

  • FirebaseFirestore-iOS-FirebaseFirestoreSwift.framework

    Overall coverage changed from ? (770776d) to 0.00% (d15ad50) by ?.

Test Logs

  1. https://storage.googleapis.com/firebase-sdk-metric-reports/LdrfiQLObZ.html

Firestore/Example/Podfile Outdated Show resolved Hide resolved
Firestore/Source/API/FIRAggregateField+Internal.h Outdated Show resolved Hide resolved
scripts/sync_project.rb Outdated Show resolved Hide resolved
@google-oss-bot
Copy link

Size Report 1

Affected Products

  • FirebaseCrashlytics

    TypeBase (770776d)Merge (d15ad50)Diff
    CocoaPods?-51.5 kB? (?)
  • FirebaseFirestore

    TypeBase (770776d)Merge (d15ad50)Diff
    CocoaPods?-51.5 kB? (?)

Test Logs

  1. https://storage.googleapis.com/firebase-sdk-metric-reports/QfsktHEHN5.html

Copy link
Member

@paulb777 paulb777 left a comment

Choose a reason for hiding this comment

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

LGTM on green

Firestore/Example/Podfile Show resolved Hide resolved
Package.swift Show resolved Hide resolved
@ncooke3
Copy link
Member Author

ncooke3 commented Oct 19, 2023

CI seems to have stalled but package-HEAD was green, so I will try merging, re-tagging, and staging.

@ncooke3 ncooke3 enabled auto-merge (squash) October 19, 2023 23:52
@ncooke3 ncooke3 merged commit 992dd55 into master Oct 19, 2023
61 of 62 checks passed
@ncooke3 ncooke3 deleted the nc/firestore-swift-merged branch October 19, 2023 23:52
ncooke3 added a commit that referenced this pull request Oct 19, 2023
@firebase firebase locked and limited conversation to collaborators Nov 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants