Tidepool sync 2026-05-11#36
Open
loopkitdev wants to merge 100 commits into
Open
Conversation
…m-event-store LOOP-4735 CGM Event Store
…m-event-store LOOP-4735 CGM Event Store
…go-recommendations LOOP-4665 Update test for api change
…go-recommendations LOOP-4665 Update test for api change
* Types moved to LoopAlgorithm * Types moved to LoopAlgorithm
* Types moved to LoopAlgorithm * Types moved to LoopAlgorithm
* Update for remote data service protocol changes * Upload device logs
* Update for remote data service protocol changes * Upload device logs
…#104) * Specify correct duration for basal segments * Fix test
…#104) * Specify correct duration for basal segments * Fix test
* report time zone changes * removed unneeded print statement * set device log uploader when remoteDataServiceDelegate is set
These files use AbsoluteScheduleValue and TDeviceLogEntry from the LoopAlgorithm package. The import was incorrectly removed during the Tidepool sync conflict resolution.
Updated translations from lokalise on Fri Mar 27 14:20:33 PDT 2026
Xcode extracted new localizable strings and marked stale entries after the tidepool-sync/2026-03-10 merge and build.
Resolved source + pbxproj conflicts. Source resolutions: - TidepoolServiceKit/Extensions/DoseEntry.swift: kept DIY's import LoopAlgorithm (preserves commit 7b6a704). Note: the pre-staged resolution leaves an apparently-duplicate 'import LoopAlgorithm' that should be deduped in follow-up. - DeviceLogUploader.swift: not in conflict — DIY's import LoopAlgorithm (commit 7b6a704) was preserved by the merge automatically. pbxproj: - Dropped Tidepool's .strings PBXFileReferences (10 entries: da/tr/vi/cs/he/ja, some duplicated) — DIY uses .xcstrings (rule 1). - Kept DIY's Localizable.xcstrings PBXBuildFile and PBXFileReference entries (rule 2). - Preserved LOCALIZATION_PREFERS_STRING_CATALOGS = YES in two XCBuildConfiguration blocks (rule 5). - No orphaned references from dropped IDs.
Merge of tidepool/dev created two import LoopAlgorithm lines (DIY had it first alphabetically, Tidepool had it last). Removed the trailing dup.
This was referenced May 20, 2026
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Refreshed Tidepool → DIY sync from the
tidepool-sync/2026-05-11branch.This supersedes and replaces the previous Tidepool Merge PR (#23), which is being closed in favor of this one.