diff --git a/Cartfile b/Cartfile index 8164e70749..c10b8623f5 100644 --- a/Cartfile +++ b/Cartfile @@ -4,4 +4,4 @@ github "loudnate/SwiftCharts" "loudnate/naterade" github "mddub/dexcom-share-client-swift" ~> 0.1 github "mddub/G4ShareSpy" ~> 0.2.2 github "ps2/rileylink_ios" ~> 0.9.0 -github "amplitude/Amplitude-iOS" "mpurland-framework" +github "amplitude/Amplitude-iOS" ~> 3.8.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 1e080e2251..5c76a8ebf2 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7" +github "amplitude/Amplitude-iOS" "v3.8.4" github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3" github "mddub/G4ShareSpy" "v0.2.2" github "loudnate/LoopKit" "v0.5.1" diff --git a/Carthage/Build/iOS/Amplitude.framework/Amplitude b/Carthage/Build/iOS/Amplitude.framework/Amplitude new file mode 100755 index 0000000000..9240e36edc Binary files /dev/null and b/Carthage/Build/iOS/Amplitude.framework/Amplitude differ diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPARCMacros.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPARCMacros.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDatabaseHelper.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDatabaseHelper.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDeviceInfo.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDeviceInfo.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDeviceInfo.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPDeviceInfo.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPIdentify.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPIdentify.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPIdentify.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPIdentify.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPLocationManagerDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPLocationManagerDelegate.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPLocationManagerDelegate.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPLocationManagerDelegate.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h similarity index 95% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h index d116ca01c4..7b4b1bdaa5 100644 --- a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h +++ b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h @@ -9,7 +9,7 @@ /** `AMPRevenue` objects are a wrapper for revenue data, which get passed to the `logRevenueV2` method to send to Amplitude servers. - **Note:** productId and price are required fields. If quantity is not specified, then defaults to 1. + **Note:** price is a required field. If quantity is not specified, then defaults to 1. **Note:** Revenue amount is calculated as price * quantity. @@ -32,9 +32,7 @@ */ /** - The product identifier for the transaction. - - @warning: required field + The product identifier for the transaction (optional). */ @property (nonatomic, strong, readonly) NSString *productId; @@ -99,7 +97,7 @@ */ /** - Set a value for the product identifier. This field is required for all revenue being logged. + Set a value for the product identifier. @param productIdentifier The value for the product identifier. Empty strings are ignored. diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPURLConnection.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPURLConnection.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPUtils.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPUtils.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPUtils.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPUtils.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude+SSLPinning.h b/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude+SSLPinning.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude.h b/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude.h diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h new file mode 100644 index 0000000000..196fa3f2d5 --- /dev/null +++ b/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h @@ -0,0 +1,24 @@ +#import + +//! Project version number for Amplitude. +FOUNDATION_EXPORT double AmplitudeVersionNumber; + +//! Project version string for Amplitude. +FOUNDATION_EXPORT const unsigned char AmplitudeVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPCertificatePinning.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPCertificatePinning.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPCertificatePinning.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/ISPCertificatePinning.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLConnectionDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLConnectionDelegate.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLSessionDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLSessionDelegate.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.h diff --git a/Carthage/Build/iOS/Amplitude.framework/Info.plist b/Carthage/Build/iOS/Amplitude.framework/Info.plist new file mode 100644 index 0000000000..165f851829 Binary files /dev/null and b/Carthage/Build/iOS/Amplitude.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap b/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap new file mode 100644 index 0000000000..3a871d1523 --- /dev/null +++ b/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Amplitude { + umbrella header "AmplitudeFramework.h" + + export * + module * { export * } +} \ No newline at end of file diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework b/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework deleted file mode 100755 index 58675749a5..0000000000 Binary files a/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework and /dev/null differ diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AmplitudeFramework.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AmplitudeFramework.h deleted file mode 100644 index 23823f4e7c..0000000000 --- a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AmplitudeFramework.h +++ /dev/null @@ -1,24 +0,0 @@ -#import - -//! Project version number for AmplitudeFramework. -FOUNDATION_EXPORT double AmplitudeFrameworkVersionNumber; - -//! Project version string for AmplitudeFramework. -FOUNDATION_EXPORT const unsigned char AmplitudeFrameworkVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Info.plist b/Carthage/Build/iOS/AmplitudeFramework.framework/Info.plist deleted file mode 100644 index 1d0f56b75b..0000000000 Binary files a/Carthage/Build/iOS/AmplitudeFramework.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Modules/module.modulemap b/Carthage/Build/iOS/AmplitudeFramework.framework/Modules/module.modulemap deleted file mode 100644 index 064b57f765..0000000000 --- a/Carthage/Build/iOS/AmplitudeFramework.framework/Modules/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module AmplitudeFramework { - umbrella header "AmplitudeFramework.h" - - export * - module * { export * } -} diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index df94b25aee..8c880c35fb 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -41,6 +41,7 @@ 434F545F1D288345002A9274 /* ShareService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F545E1D288345002A9274 /* ShareService.swift */; }; 434F54611D28859B002A9274 /* ServiceCredential.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54601D28859B002A9274 /* ServiceCredential.swift */; }; 434F54631D28DD80002A9274 /* ValidatingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */; }; + 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 434FB6451D68F1CD007B9C70 /* Amplitude.framework */; }; 434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */; }; 434FF1EE1CF27EEF000DB779 /* UITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */; }; 43523EDB1CC35083001850F1 /* RileyLinkKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43523EDA1CC35083001850F1 /* RileyLinkKit.framework */; }; @@ -73,7 +74,6 @@ 438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */; }; 439897351CD2F7DE00223065 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; }; 439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897361CD2F80600223065 /* AnalyticsManager.swift */; }; - 439897391CD2F82C00223065 /* AmplitudeFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 439897381CD2F82C00223065 /* AmplitudeFramework.framework */; }; 4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4398973A1CD2FC2000223065 /* NSDateFormatter.swift */; }; 43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A567681C94880B00334FAC /* LoopDataManager.swift */; }; 43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */; }; @@ -262,6 +262,7 @@ 434F545E1D288345002A9274 /* ShareService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareService.swift; sourceTree = ""; }; 434F54601D28859B002A9274 /* ServiceCredential.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceCredential.swift; sourceTree = ""; }; 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidatingIndicatorView.swift; sourceTree = ""; }; + 434FB6451D68F1CD007B9C70 /* Amplitude.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Amplitude.framework; path = Carthage/Build/iOS/Amplitude.framework; sourceTree = ""; }; 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifiableClass.swift; sourceTree = ""; }; 434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableViewCell.swift; sourceTree = ""; }; 43523EDA1CC35083001850F1 /* RileyLinkKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RileyLinkKit.framework; path = Carthage/Build/iOS/RileyLinkKit.framework; sourceTree = ""; }; @@ -292,7 +293,6 @@ 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopStateView.swift; sourceTree = ""; }; 439897341CD2F7DE00223065 /* NSTimeInterval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSTimeInterval.swift; sourceTree = ""; }; 439897361CD2F80600223065 /* AnalyticsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AnalyticsManager.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; - 439897381CD2F82C00223065 /* AmplitudeFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AmplitudeFramework.framework; path = Carthage/Build/iOS/AmplitudeFramework.framework; sourceTree = ""; }; 4398973A1CD2FC2000223065 /* NSDateFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDateFormatter.swift; sourceTree = ""; }; 43A567681C94880B00334FAC /* LoopDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = LoopDataManager.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwitchTableViewCell.swift; sourceTree = ""; }; @@ -383,8 +383,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */, C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */, - 439897391CD2F82C00223065 /* AmplitudeFramework.framework in Frameworks */, 43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */, 4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */, 43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */, @@ -687,9 +687,9 @@ 968DCD53F724DE56FFE51920 /* Frameworks */ = { isa = PBXGroup; children = ( + 434FB6451D68F1CD007B9C70 /* Amplitude.framework */, C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */, 43B371871CE597D10013C5A6 /* ShareClient.framework */, - 439897381CD2F82C00223065 /* AmplitudeFramework.framework */, 43F78D481C914197002152D1 /* CarbKit.framework */, 43EDDBF01C361C75007D89B5 /* CommonCrypto.framework */, 43EDDBF51C361D24007D89B5 /* CommonCrypto.framework.dSYM */, @@ -958,7 +958,7 @@ "$(SRCROOT)/Carthage/Build/iOS/MinimedKit.framework", "$(SRCROOT)/Carthage/Build/iOS/RileyLinkBLEKit.framework", "$(SRCROOT)/Carthage/Build/iOS/RileyLinkKit.framework", - "$(SRCROOT)/Carthage/Build/iOS/AmplitudeFramework.framework", + "$(SRCROOT)/Carthage/Build/iOS/Amplitude.framework", "$(SRCROOT)/Carthage/Build/iOS/ShareClient.framework", "$(SRCROOT)/Carthage/Build/iOS/NightscoutUploadKit.framework", "$(SRCROOT)/Carthage/Build/iOS/Crypto.framework", diff --git a/Loop/Managers/AnalyticsManager.swift b/Loop/Managers/AnalyticsManager.swift index 9902f32188..ec41fb8b53 100644 --- a/Loop/Managers/AnalyticsManager.swift +++ b/Loop/Managers/AnalyticsManager.swift @@ -7,7 +7,7 @@ // import Foundation -import AmplitudeFramework +import Amplitude final class AnalyticsManager { diff --git a/Loop/Models/AmplitudeService.swift b/Loop/Models/AmplitudeService.swift index 4f091a6387..d32f6cfb87 100644 --- a/Loop/Models/AmplitudeService.swift +++ b/Loop/Models/AmplitudeService.swift @@ -7,7 +7,7 @@ // import Foundation -import AmplitudeFramework +import Amplitude struct AmplitudeService: ServiceAuthentication {