Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: google/GoogleDataTransport
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: google/GoogleDataTransport
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: mm/promises-todo
Choose a head ref
  • 7 commits
  • 26 files changed
  • 1 contributor

Commits on Jan 29, 2021

  1. Squashed commit of the following: 

    commit 563db8b3062a8361b24e7fa1f4a23253d9dbca3f
Author: Maksym Malyhin <[email protected]>
Date:   Tue Jan 12 18:02:01 2021 -0500

    GDT: upload URL request steps wrapped into promises (#6771)

    * Fix build

    * Rename GDTCCTUploader2.m back to GDTCCTUploader.m

    * GDT: Add GoogleUtilities/Environment dependency

    * WIP

    * Remove unnecessary logic

    * next upload time storage implementation

    * GDTCCTUploader debug logs and test helpers

    * URL request steps

    * Fix modular FBLPromise imports

    * GDT GUL dependency in SwiftPM

    * Cleanup

    * Formatting

    * Update dependency

    * Fix WatchOS app

    * Update imports

    * [WIP] Integration tests with a test server

    * Remove GDTCCTUploadCompleteNotification

    * GDTCCTIntegrationTest: use test server instead of a real server.

    * Fix GDTCCTUploadOperation.uploadAttempted flag

    * Fix GDTCCTUploader waitForUploadFinished method

    * GDTCORIntegrationTestEvent: wait for the final upload to finish before stopping test server

    * style

    * Cleanup

    * merge fix

    * Fix waitForUploadFinishedWithTimeout:

    * Cleanup

    * GDTCCTUploaderTest: wait for operation finish before tearDown

    * GDTCCTIntegrationTest: enable debug logs

    * Increase timeout

    * Debug logs on CI

    * Handle not started operation cancellation properly

    * GDTCOREncodeArchive: fix log messages

    * Revert debug logging

    * ./scripts/style.sh

    * ./scripts/style.sh  with clang-format 11.0.1

    * Enable verbose pod lib lint logs

    * fail-fast disable retry

    * GDTCCTUploadOperation: set proper state for not stated operation without KVO.

    * revert verbose logs

    * Comments

commit 28f561f459fe4c3e926750cf92c960a5d83ed160
Merge: 382eee99e 3d84b9985
Author: Maksym Malyhin <[email protected]>
Date:   Fri Jan 8 15:20:44 2021 -0500

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit 382eee99ecc6559e86d1104198c069cf080229c9
Author: Maksym Malyhin <[email protected]>
Date:   Thu Dec 10 10:22:19 2020 -0500

    Fix merge errors

commit 52b3a31d6a4f1c1efeacc4e5b195c62133eb2835
Merge: 8e1c203b7 3720a72ba
Author: Maksym Malyhin <[email protected]>
Date:   Thu Dec 10 10:12:52 2020 -0500

    Merge branch 'master' into mm/gdt-promise-merge

commit 8e1c203b7ada390fa3ee4ccdcea396109368ee6a
Merge: 8881f2301 f0a8e74ee
Author: Maksym Malyhin <[email protected]>
Date:   Wed Nov 4 15:23:53 2020 -0500

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit 8881f2301a9952cccd134565edd6ac9f4dce3445
Merge: c0812aeb3 b05be68db
Author: Maksym Malyhin <[email protected]>
Date:   Thu Oct 29 17:02:02 2020 -0400

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit c0812aeb38e4aef1f9976bc1928504d9331fbcd9
Merge: 2ac027d9d ff23d08f6
Author: Maksym Malyhin <[email protected]>
Date:   Fri Oct 16 16:23:53 2020 -0400

    Merge branch 'gdt-promises-main' of github.com:firebase/firebase-ios-sdk into gdt-promises-main

commit 2ac027d9d3f8dbb8fb2e5b4c5c89f9506bd149d5
Merge: ef4385b71 7e70a6dd0
Author: Maksym Malyhin <[email protected]>
Date:   Fri Oct 16 16:23:40 2020 -0400

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit ff23d08f6901edb167d8e9ed1441b3846f43e315
Author: Maksym Malyhin <[email protected]>
Date:   Fri Oct 16 13:43:07 2020 -0400

    Rename GDTCCTUploader2.m back to GDTCCTUploader.m (#6748)

    * Fix build

    * Rename GDTCCTUploader2.m back to GDTCCTUploader.m

commit ef4385b71c67e7ab4c24e125d2dd6f534ce9af68
Author: Maksym Malyhin <[email protected]>
Date:   Thu Oct 15 13:39:33 2020 -0400

    GDT: wrap and bind upload operation using promises (#6728)

    * Fix header imports

    * Wrap and chain batching operations

    * Fix test compilation

    * todo

    * Cleanup

    * Storage condition

    * Recover GDTCCTUploaderTest

    * Revert unintended change

    * NDEBUG TODO

    * Interupt upload erlier when storage is missing

    * style

commit 0c2bf2aa37d82ee7d77147c9dde46768d883919e
Merge: f84069ae8 1c79d9bce
Author: Maksym Malyhin <[email protected]>
Date:   Wed Oct 14 09:30:45 2020 -0400

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit f84069ae8a9b1b3ecbc85f158e44637f9530639c
Merge: 5d96f9699 ec14d8252
Author: Maksym Malyhin <[email protected]>
Date:   Thu Oct 8 15:19:55 2020 -0400

    Merge branch 'gdt-promises-main' of github.com:firebase/firebase-ios-sdk into gdt-promises-main

commit 5d96f9699b3b72cf5a6413083890b9f3d656d928
Merge: f6595a0c8 bff6b664d
Author: Maksym Malyhin <[email protected]>
Date:   Thu Oct 8 15:19:30 2020 -0400

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit ec14d825245591abb61963f7962cd9ef15e34299
Author: Maksym Malyhin <[email protected]>
Date:   Tue Sep 29 13:53:53 2020 -0400

    Move common state from GDTCCTUploadOperation to GDTCCTUploader (#6587)

    * Move URLs from `GDTCCTUploadOperation` to `GDTCCTUploader`

    * Move next upload time tracking from `GDTCCTUploadOperation` to `GDTCCTUploader`

    * Rename back GDTCCTUploader2.m -> GDTCCTUploader.m

    * Revert "Rename back GDTCCTUploader2.m -> GDTCCTUploader.m"

    This reverts commit a4946d2524846917bf7b9c5e565f015ffa311bcd.

    * ./scripts/style.sh

    * Camel case

    * Cleanup

    * Move optional API key to metadata provider

    * Use a common dispatch queue for upload operations

commit f6595a0c8ed9d7289746b1beff68b12a64232ef7
Merge: 27595267e d75180498
Author: Maksym Malyhin <[email protected]>
Date:   Mon Sep 28 13:03:53 2020 -0400

    Merge branch 'gdt-promises-main' of github.com:firebase/firebase-ios-sdk into gdt-promises-main

commit 27595267e716d9cb07a011f542d78455af2a53ae
Merge: 17a65e58c 38be2cc8c
Author: Maksym Malyhin <[email protected]>
Date:   Mon Sep 28 13:03:28 2020 -0400

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit d7518049885ab82e164fcc7a05941fe89952bf42
Author: Maksym Malyhin <[email protected]>
Date:   Thu Sep 24 15:48:02 2020 -0400

    GDTCORStorage: promise API wrapper (#6555)

commit 17a65e58c5e62befcc660b70c564564447d30613
Merge: eadc50297 0c6dd55ad
Author: Maksym Malyhin <[email protected]>
Date:   Thu Sep 24 10:24:29 2020 -0400

    Merge remote-tracking branch 'origin/master' into gdt-promises-main

commit eadc502973bb6632bd3ba04527b509820be99e7e
Author: Maksym Malyhin <[email protected]>
Date:   Thu Sep 24 10:03:48 2020 -0400

    GDTCCTUploader: use NSOperationQueue to coordinate uploads (#6536)

    * File rename GDTCCTUploader -> GDTCCTUploadOperation

    * GDTCCTUploader: use operation queue to coordinate uploads

    * Try to rename original file to improve diff

    * File headers and TODOs
    @maksymmalyhin
    maksymmalyhin committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    db2cf69 View commit details
    Browse the repository at this point in the history

  2. merge errors

    @maksymmalyhin
    maksymmalyhin committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    c11d3be View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2021

  1. More detailed and useful integration tests (#4) 

    * [WIP] decode request in integration tests

* Integration tests - validate all events payloads are sent

* Fix SPM

* Clean storage before tests

* style

* Cleanup and comments.

* More comments

* Validate log source(mappingID)

* Fix FBLPromises.h import

* cleanup .gitignore
    @maksymmalyhin
    maksymmalyhin authored Feb 2, 2021
    Configuration menu
    Copy the full SHA
    82ff65a View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2021

  1. Merge branch 'main' into gdt-promises-main

    @maksymmalyhin
    maksymmalyhin committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    8c9214b View commit details
    Browse the repository at this point in the history

  2. fix .gitignore

    @maksymmalyhin
    maksymmalyhin committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    14eaeb3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gdt-promises-main' of github.com:google/GoogleDataTrans… 

    …port into gdt-promises-main
    @maksymmalyhin
    maksymmalyhin committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    e7e8015 View commit details
    Browse the repository at this point in the history

  4. WIP: GDTCORStoragePromiseAdapter

    @maksymmalyhin
    maksymmalyhin committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    db073f0 View commit details
    Browse the repository at this point in the history
Loading