Skip to content

Commit 1b5705d

Browse files
authored
Merge pull request #961 from LoopKit/merge-tidepool
Merge tidepool build updates
2 parents 9aadbdd + f61942b commit 1b5705d

14 files changed

+172
-161
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ xcuserdata
2222
*.moved-aside
2323
*.xcuserstate
2424
*.xcscmblueprint
25-
project.xcworkspace
2625

2726
## Obj-C/Swift specific
2827
*.hmap
@@ -55,7 +54,7 @@ Carthage/
5554

5655
# fastlane
5756
#
58-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
57+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
5958
# screenshots whenever they are needed.
6059
# For more information about the recommended setup visit:
6160
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md

Cartfile.resolved

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
2-
github "LoopKit/CGMBLEKit" "95ea2c1f364055f7b2c97c88d689d376b9bbc838"
3-
github "LoopKit/G4ShareSpy" "a7df88dd20e204367ec10eb0727677aace2366b7"
4-
github "LoopKit/LoopKit" "7333408f054e269669c91146b0f29bffbdcc150a"
5-
github "LoopKit/dexcom-share-client-swift" "23d7a8b1b9773ce054e4ad4829dc4234c7206b9a"
2+
github "LoopKit/CGMBLEKit" "4194dbdabd4a2df390f41ada25bb99941fd165ca"
3+
github "LoopKit/G4ShareSpy" "4e4ea119d34d65cee35ccab9df0259e1dee52460"
4+
github "LoopKit/LoopKit" "346f5e85940fb56211035ae2e9f522512f17d0c0"
5+
github "LoopKit/dexcom-share-client-swift" "2179b253800dc527391ac582bdc9a0a7622e17c1"
66
github "i-schuetz/SwiftCharts" "0.6.5"
77
github "maxkonovalov/MKRingProgressView" "2.2.2"
8-
github "ps2/rileylink_ios" "23776aaf5ca54832aab275e148cb6f6079ccaaab"
8+
github "ps2/rileylink_ios" "f616a671bac254b25c5e298f01824200944c2267"

Loop.xcodeproj/project.pbxproj

Lines changed: 126 additions & 144 deletions
Large diffs are not rendered by default.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
6+
<false/>
7+
</dict>
8+
</plist>

Loop.xcodeproj/xcshareddata/xcschemes/Cartfile.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
99
<BuildActionEntry
1010
buildForTesting = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
version = "2.0">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
99
<BuildActionEntry
1010
buildForTesting = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "NO">
88
</BuildAction>
99
<TestAction
1010
buildConfiguration = "Debug"

Loop.xcodeproj/xcshareddata/xcschemes/Learn.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
99
<BuildActionEntry
1010
buildForTesting = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
version = "2.0">
66
<BuildAction
77
parallelizeBuildables = "YES"
8-
buildImplicitDependencies = "YES">
8+
buildImplicitDependencies = "NO">
99
<BuildActionEntries>
1010
<BuildActionEntry
1111
buildForTesting = "YES"

0 commit comments

Comments
 (0)