From 0ea695c8f50693ed94f1b74e9ddee747a5bac4f0 Mon Sep 17 00:00:00 2001 From: cukrzycawpetli <49746355+cukrzycawpetli@users.noreply.github.com> Date: Thu, 18 Apr 2019 09:57:41 +0200 Subject: [PATCH 1/4] Update Cartfile --- Cartfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Cartfile b/Cartfile index fa7ce1de3a..abedd12748 100644 --- a/Cartfile +++ b/Cartfile @@ -6,3 +6,4 @@ github "LoopKit/dexcom-share-client-swift" == 1.0 github "LoopKit/G4ShareSpy" == 1.0 github "ps2/rileylink_ios" ~> 2.1 github "LoopKit/Amplitude-iOS" "decreepify" +github "cukrzycawpetli/spike-client-swift" "nsshareserver-master" From 9e6d0ec09e7f250015561de90ff7b6144811f4fa Mon Sep 17 00:00:00 2001 From: cukrzycawpetli <49746355+cukrzycawpetli@users.noreply.github.com> Date: Thu, 18 Apr 2019 10:01:36 +0200 Subject: [PATCH 2/4] Update Cartfile --- Cartfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Cartfile b/Cartfile index abedd12748..fa7ce1de3a 100644 --- a/Cartfile +++ b/Cartfile @@ -6,4 +6,3 @@ github "LoopKit/dexcom-share-client-swift" == 1.0 github "LoopKit/G4ShareSpy" == 1.0 github "ps2/rileylink_ios" ~> 2.1 github "LoopKit/Amplitude-iOS" "decreepify" -github "cukrzycawpetli/spike-client-swift" "nsshareserver-master" From 529ef670c74280500e763b6c1c925fe1d62bba1b Mon Sep 17 00:00:00 2001 From: cukrzycawpetli <49746355+cukrzycawpetli@users.noreply.github.com> Date: Thu, 18 Apr 2019 12:24:00 +0200 Subject: [PATCH 3/4] Update project.pbxproj Changes in frameworks --- Loop.xcodeproj/project.pbxproj | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index d69a59fb6a..c08671b08f 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -278,6 +278,8 @@ 4FF4D1011E18375000846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; }; 7D23667D21250C7E0028B67D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D23667C21250C7E0028B67D /* LocalizedString.swift */; }; 7D2366E621250E0A0028B67D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D2366E421250E0A0028B67D /* InfoPlist.strings */; }; + 7D24CFEB22151C470003C3CE /* SpikeClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D24CFEA22151C470003C3CE /* SpikeClient.framework */; }; + 7D24CFED22151C570003C3CE /* SpikeClientUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D24CFEC22151C570003C3CE /* SpikeClientUI.framework */; }; 7D7076351FE06EDE004AC8EA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076371FE06EDE004AC8EA /* Localizable.strings */; }; 7D70763A1FE06EDF004AC8EA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D70763C1FE06EDF004AC8EA /* InfoPlist.strings */; }; 7D70763F1FE06EDF004AC8EA /* ckcomplication.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076411FE06EDF004AC8EA /* ckcomplication.strings */; }; @@ -796,6 +798,8 @@ 7D2366EC21250ECE0028B67D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; 7D2366ED21250F010028B67D /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = ""; }; 7D2366EE21250F170028B67D /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = ""; }; + 7D24CFEA22151C470003C3CE /* SpikeClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpikeClient.framework; path = Carthage/Build/iOS/SpikeClient.framework; sourceTree = ""; }; + 7D24CFEC22151C570003C3CE /* SpikeClientUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpikeClientUI.framework; path = Carthage/Build/iOS/SpikeClientUI.framework; sourceTree = ""; }; 7D68AAA91FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = ""; }; 7D68AAAA1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = ""; }; 7D68AAAB1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MainInterface.strings; sourceTree = ""; }; @@ -861,6 +865,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7D24CFED22151C570003C3CE /* SpikeClientUI.framework in Frameworks */, + 7D24CFEB22151C470003C3CE /* SpikeClient.framework in Frameworks */, 4F7528941DFE1E9500C322D6 /* LoopUI.framework in Frameworks */, 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */, 43A8EC6F210E622700A81379 /* CGMBLEKitUI.framework in Frameworks */, @@ -1402,6 +1408,8 @@ 968DCD53F724DE56FFE51920 /* Frameworks */ = { isa = PBXGroup; children = ( + 7D24CFEC22151C570003C3CE /* SpikeClientUI.framework */, + 7D24CFEA22151C470003C3CE /* SpikeClient.framework */, 434FB6451D68F1CD007B9C70 /* Amplitude.framework */, 4344628420A7A3BE00C4BE6F /* CGMBLEKit.framework */, 438A95A71D8B9B24009D12E1 /* CGMBLEKit.framework */, @@ -1846,6 +1854,8 @@ "$(SRCROOT)/Carthage/Build/iOS/MinimedKitUI.framework", "$(SRCROOT)/Carthage/Build/iOS/CGMBLEKitUI.framework", "$(SRCROOT)/Carthage/Build/iOS/ShareClientUI.framework", + "$(SRCROOT)/Carthage/Build/iOS/SpikeClientUI.framework", + "$(SRCROOT)/Carthage/Build/iOS/SpikeClient.framework", ); name = "Copy Frameworks with Carthage"; outputPaths = ( From 7f6d5abf36907d3200670634568bba4c60a0aeb4 Mon Sep 17 00:00:00 2001 From: Jerry Date: Thu, 18 Apr 2019 12:34:44 +0200 Subject: [PATCH 4/4] Revert "Update project.pbxproj" This reverts commit 529ef670c74280500e763b6c1c925fe1d62bba1b. --- Loop.xcodeproj/project.pbxproj | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index c08671b08f..d69a59fb6a 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -278,8 +278,6 @@ 4FF4D1011E18375000846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; }; 7D23667D21250C7E0028B67D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D23667C21250C7E0028B67D /* LocalizedString.swift */; }; 7D2366E621250E0A0028B67D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D2366E421250E0A0028B67D /* InfoPlist.strings */; }; - 7D24CFEB22151C470003C3CE /* SpikeClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D24CFEA22151C470003C3CE /* SpikeClient.framework */; }; - 7D24CFED22151C570003C3CE /* SpikeClientUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D24CFEC22151C570003C3CE /* SpikeClientUI.framework */; }; 7D7076351FE06EDE004AC8EA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076371FE06EDE004AC8EA /* Localizable.strings */; }; 7D70763A1FE06EDF004AC8EA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D70763C1FE06EDF004AC8EA /* InfoPlist.strings */; }; 7D70763F1FE06EDF004AC8EA /* ckcomplication.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076411FE06EDF004AC8EA /* ckcomplication.strings */; }; @@ -798,8 +796,6 @@ 7D2366EC21250ECE0028B67D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; 7D2366ED21250F010028B67D /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = ""; }; 7D2366EE21250F170028B67D /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = ""; }; - 7D24CFEA22151C470003C3CE /* SpikeClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpikeClient.framework; path = Carthage/Build/iOS/SpikeClient.framework; sourceTree = ""; }; - 7D24CFEC22151C570003C3CE /* SpikeClientUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpikeClientUI.framework; path = Carthage/Build/iOS/SpikeClientUI.framework; sourceTree = ""; }; 7D68AAA91FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = ""; }; 7D68AAAA1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = ""; }; 7D68AAAB1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MainInterface.strings; sourceTree = ""; }; @@ -865,8 +861,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7D24CFED22151C570003C3CE /* SpikeClientUI.framework in Frameworks */, - 7D24CFEB22151C470003C3CE /* SpikeClient.framework in Frameworks */, 4F7528941DFE1E9500C322D6 /* LoopUI.framework in Frameworks */, 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */, 43A8EC6F210E622700A81379 /* CGMBLEKitUI.framework in Frameworks */, @@ -1408,8 +1402,6 @@ 968DCD53F724DE56FFE51920 /* Frameworks */ = { isa = PBXGroup; children = ( - 7D24CFEC22151C570003C3CE /* SpikeClientUI.framework */, - 7D24CFEA22151C470003C3CE /* SpikeClient.framework */, 434FB6451D68F1CD007B9C70 /* Amplitude.framework */, 4344628420A7A3BE00C4BE6F /* CGMBLEKit.framework */, 438A95A71D8B9B24009D12E1 /* CGMBLEKit.framework */, @@ -1854,8 +1846,6 @@ "$(SRCROOT)/Carthage/Build/iOS/MinimedKitUI.framework", "$(SRCROOT)/Carthage/Build/iOS/CGMBLEKitUI.framework", "$(SRCROOT)/Carthage/Build/iOS/ShareClientUI.framework", - "$(SRCROOT)/Carthage/Build/iOS/SpikeClientUI.framework", - "$(SRCROOT)/Carthage/Build/iOS/SpikeClient.framework", ); name = "Copy Frameworks with Carthage"; outputPaths = (