diff --git a/.travis.yml b/.travis.yml index 4f7f27be3a..e9ad3e32cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,13 @@ language: objective-c -osx_image: xcode7.3 -# xcode_sdk: iphonesimulator9.3 +osx_image: xcode8 +# xcode_sdk: iphonesimulator10.0 # xcode_project: Loop.xcodeproj # xcode_scheme: Loop before_script: # - carthage bootstrap - - cp Loop/RemoteSettings-template.plist Loop/RemoteSettings.plist script: # Build the app target - - xctool -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + - xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty # Run the test target - - xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone 6' test | xcpretty - - xctool -project Loop.xcodeproj -scheme DoseMathTests -sdk iphonesimulator9.3 test + - xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone SE' test | xcpretty + - xcodebuild -project Loop.xcodeproj -scheme DoseMathTests -destination 'name=iPhone SE' test | xcpretty diff --git a/Cartfile b/Cartfile index fbfa89a65b..ed93bef603 100644 --- a/Cartfile +++ b/Cartfile @@ -1,7 +1,7 @@ -github "loudnate/LoopKit" ~> 0.7.0 -github "loudnate/xDripG5" ~> 0.6.0 -github "loudnate/SwiftCharts" "loudnate/naterade" -github "mddub/dexcom-share-client-swift" ~> 0.1 -github "mddub/G4ShareSpy" ~> 0.2.2 -github "ps2/rileylink_ios" ~> 0.11.2 +github "loudnate/LoopKit" ~> 0.8.0 +github "loudnate/xDripG5" ~> 0.7.0 +github "i-schuetz/SwiftCharts" ~> 0.5.0 +github "mddub/dexcom-share-client-swift" ~> 0.2.0 +github "mddub/G4ShareSpy" ~> 0.3.0 +github "ps2/rileylink_ios" ~> 0.12.0 github "amplitude/Amplitude-iOS" ~> 3.8.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index 86f3375621..4fbdca2110 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,8 +1,7 @@ github "amplitude/Amplitude-iOS" "v3.8.5" -github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3" -github "mddub/G4ShareSpy" "v0.2.2" -github "loudnate/LoopKit" "v0.7.0" -github "loudnate/SwiftCharts" "0c58586ab36a9f358b5fff281f52b7528fe2dc5e" -github "mddub/dexcom-share-client-swift" "v0.1.3" -github "loudnate/xDripG5" "v0.6.0" -github "ps2/rileylink_ios" "v0.11.2" +github "mddub/G4ShareSpy" "v0.3.0" +github "loudnate/LoopKit" "v0.8.0" +github "i-schuetz/SwiftCharts" "0.5" +github "mddub/dexcom-share-client-swift" "v0.2.0" +github "ps2/rileylink_ios" "v0.12.0" +github "loudnate/xDripG5" "v0.7.0" diff --git a/Carthage/Build/iOS/Amplitude.framework/Amplitude b/Carthage/Build/iOS/Amplitude.framework/Amplitude index 67a8932135..6557f2ac4c 100755 Binary files a/Carthage/Build/iOS/Amplitude.framework/Amplitude and b/Carthage/Build/iOS/Amplitude.framework/Amplitude differ diff --git a/Carthage/Build/iOS/Amplitude.framework/Info.plist b/Carthage/Build/iOS/Amplitude.framework/Info.plist index 165f851829..c44f5af4ff 100644 Binary files a/Carthage/Build/iOS/Amplitude.framework/Info.plist and b/Carthage/Build/iOS/Amplitude.framework/Info.plist differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit b/Carthage/Build/iOS/CarbKit.framework/CarbKit index 3e8c85abc2..ca00023a19 100755 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit and b/Carthage/Build/iOS/CarbKit.framework/CarbKit differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib index 8625f93f4c..4fa8ae02b3 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib index 7ebed40fa3..dc16914803 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib index 891d0254c6..8c32e4f60a 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib index 581b9984a9..180e336153 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib index 3f51381fc6..2c7ee61a4d 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h index 37240755ba..c129748fac 100644 --- a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h +++ b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,17 +106,19 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; -@import HealthKit; @import Foundation; +@import HealthKit; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" @class HKUnit; @class UITableView; -@class NSIndexPath; @class UITableViewCell; @class UIStoryboardSegue; @class NSBundle; @@ -148,11 +165,11 @@ SWIFT_CLASS("_TtC7CarbKit28CarbEntryTableViewController") @end -@interface NSUserDefaults (SWIFT_EXTENSION(CarbKit)) +@interface UITableViewCell (SWIFT_EXTENSION(CarbKit)) @end -@interface UITableViewCell (SWIFT_EXTENSION(CarbKit)) +@interface NSUserDefaults (SWIFT_EXTENSION(CarbKit)) @end #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/CarbKit.framework/Info.plist b/Carthage/Build/iOS/CarbKit.framework/Info.plist index 97fe7548ba..81b8599836 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Info.plist and b/Carthage/Build/iOS/CarbKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc index 80e08f1aa0..cada112be5 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule index 808f7035c1..eb704c0afc 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc index 3b101c6db5..93b7d551dc 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule index e307c4d6b0..3148d2b8d1 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc index 9d5ddd229c..eaeccda461 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule index 02e02e8b84..310816e569 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc index 0527701391..c5e8887818 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule index 9defa77e56..2f26bb9b7c 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto b/Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto deleted file mode 100755 index 285526fb02..0000000000 Binary files a/Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto and /dev/null differ diff --git a/Carthage/Build/iOS/CommonCrypto.framework/Info.plist b/Carthage/Build/iOS/CommonCrypto.framework/Info.plist deleted file mode 100644 index 8da409696e..0000000000 Binary files a/Carthage/Build/iOS/CommonCrypto.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/CommonCrypto.framework/Modules/module.modulemap b/Carthage/Build/iOS/CommonCrypto.framework/Modules/module.modulemap deleted file mode 100644 index 125b77209d..0000000000 --- a/Carthage/Build/iOS/CommonCrypto.framework/Modules/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module CommonCrypto [system] { - header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/CommonCrypto/CommonCrypto.h" - export * -} diff --git a/Carthage/Build/iOS/Crypto.framework/Crypto b/Carthage/Build/iOS/Crypto.framework/Crypto index 35e4f44ec2..0882c44612 100755 Binary files a/Carthage/Build/iOS/Crypto.framework/Crypto and b/Carthage/Build/iOS/Crypto.framework/Crypto differ diff --git a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto-Swift.h b/Carthage/Build/iOS/Crypto.framework/Headers/Crypto-Swift.h deleted file mode 100644 index d5064b8ae0..0000000000 --- a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto-Swift.h +++ /dev/null @@ -1,112 +0,0 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) -#pragma clang diagnostic push - -#if defined(__has_include) && __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if defined(__has_include) && __has_include() -# include -# elif !defined(__cplusplus) || __cplusplus < 201103L -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -typedef double swift_double4 __attribute__((__ext_vector_type__(4))); -typedef int swift_int2 __attribute__((__ext_vector_type__(2))); -typedef int swift_int3 __attribute__((__ext_vector_type__(3))); -typedef int swift_int4 __attribute__((__ext_vector_type__(4))); -#endif - -#if !defined(SWIFT_PASTE) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#if !defined(SWIFT_METATYPE) -# define SWIFT_METATYPE(X) Class -#endif - -#if defined(__has_attribute) && __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if defined(__has_attribute) && __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if defined(__has_attribute) && __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type -# if defined(__has_feature) && __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_EXTRA _name : _type -# else -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) -# endif -#endif -#if defined(__has_feature) && __has_feature(modules) -@import Foundation; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" - -@interface NSData (SWIFT_EXTENSION(Crypto)) -@property (nonatomic, readonly, strong) NSData * _Nonnull MD2; -@property (nonatomic, readonly, strong) NSData * _Nonnull MD4; -@property (nonatomic, readonly, strong) NSData * _Nonnull MD5; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA1; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA224; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA256; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA384; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA512; -@end - -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h b/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h index 53063f52ec..abf4334f5d 100644 --- a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h +++ b/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h @@ -2,15 +2,23 @@ // Crypto.h // Crypto // -// Created by Sam Soffes on 4/21/15. -// Copyright (c) 2015 Sam Soffes. All rights reserved. +// Created by Nate Racklyeft on 9/13/16. +// Copyright © 2016 Pete Schwamb. All rights reserved. // -@import Foundation; -//@import CommonCrypto; +#import //! Project version number for Crypto. FOUNDATION_EXPORT double CryptoVersionNumber; //! Project version string for Crypto. FOUNDATION_EXPORT const unsigned char CryptoVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + +@interface NSString (Crypto) + +@property (nonatomic, nonnull, readonly) NSString *sha1; + +@end diff --git a/Carthage/Build/iOS/Crypto.framework/Info.plist b/Carthage/Build/iOS/Crypto.framework/Info.plist index 5f0dc97be9..0344730e94 100644 Binary files a/Carthage/Build/iOS/Crypto.framework/Info.plist and b/Carthage/Build/iOS/Crypto.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftdoc deleted file mode 100644 index 5e026e7740..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftmodule deleted file mode 100644 index 8928d7c1a7..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftdoc deleted file mode 100644 index b91807deb7..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftmodule deleted file mode 100644 index fa90e9a867..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftdoc deleted file mode 100644 index 914e539b16..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftmodule deleted file mode 100644 index 1a7c19c5b5..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 3e7a9ebf40..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 65ce350c71..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap b/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap index 0b0838b09a..9d53a1b38e 100644 --- a/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap +++ b/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap @@ -4,7 +4,3 @@ framework module Crypto { export * module * { export * } } - -module Crypto.Swift { - header "Crypto-Swift.h" -} diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy b/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy index 40c16e8d4a..b5030c3b5f 100755 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy and b/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h index a0ccf6a254..61a199d2ee 100644 --- a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h +++ b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,22 +106,12 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) -@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" - -@interface NSData (SWIFT_EXTENSION(G4ShareSpy)) -@end - - -@interface NSData (SWIFT_EXTENSION(G4ShareSpy)) -@end - - -@interface NSDate (SWIFT_EXTENSION(G4ShareSpy)) -@end - #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist b/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist index f018301662..b20fd4f682 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist and b/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc index ee6c268bae..1a90185d70 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule index 283b9023ab..4d92d81c5a 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc index 412e078983..65142c96f9 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule index 3e12f19c65..297e3e3d7e 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc index 0f026b09f7..d28076f8df 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule index 95a4b6a69c..4dcc00db99 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc index 0eb18d7ad1..7ccd7ac740 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule index 1f94850491..9e0164b134 100644 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit index ea9723a581..eb75d87e9a 100755 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit and b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h index 562f147313..f2ff5d2d65 100644 --- a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h +++ b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import HealthKit; #endif diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist index 5c966b8af0..0af20707f0 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist and b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc index 986be816d9..bfa6d4e1f4 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule index adf9793507..5befcf9d8a 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc index 84f5b2e0a9..3de0d7e03c 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule index 3939b93d9d..d908f1c87d 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc index 8e785d8219..9fc1492ad2 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule index 81a665b12d..3e5b89c37c 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc index d4122ed492..e06da3450b 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule index ef4f8e7d8c..073dd94693 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib index df01ad43fa..3a9ed1e85d 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib index 3a33a5233a..7f0193f96f 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h index 28c1f0511b..d281feea13 100644 --- a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h +++ b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; @import Foundation; @@ -99,7 +117,6 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" @class UITableView; -@class NSIndexPath; @class UITableViewCell; @class NSBundle; @class NSCoder; @@ -122,8 +139,4 @@ SWIFT_CLASS("_TtC10InsulinKit34InsulinDeliveryTableViewController") - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; @end - -@interface NSData (SWIFT_EXTENSION(InsulinKit)) -@end - #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/InsulinKit.framework/Info.plist b/Carthage/Build/iOS/InsulinKit.framework/Info.plist index 27e1c3a80c..36313c0887 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Info.plist and b/Carthage/Build/iOS/InsulinKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit index 3c1b2a2adf..a2a7f0babc 100755 Binary files a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit and b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc index 94e43fac7d..73aa4d140b 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule index 78ac2bb2ed..410dec66b0 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc index a77c8f353c..6a1c02bb3f 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule index 4a985f1c3c..6935487b61 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc index 49355c9f55..b57998c820 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule index 77884bc424..0f381cff0d 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc index 8c1610deae..7dea37d202 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule index b83445c86c..6b9425df28 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Assets.car b/Carthage/Build/iOS/LoopKit.framework/Assets.car index e9248de678..8e9717d107 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Assets.car and b/Carthage/Build/iOS/LoopKit.framework/Assets.car differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib index 6b0b0080bb..74f73984fa 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib index c4dee67895..9842e0162b 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h index 1d81b06df2..21d7130edc 100644 --- a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h +++ b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,37 +106,40 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; +@import Foundation; @import CoreGraphics; @import HealthKit; -@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" @class NSCoder; +@class NSBundle; SWIFT_CLASS("_TtC7LoopKit29CommandResponseViewController") @interface CommandResponseViewController : UIViewController -- (nonnull instancetype)initWithCommand:(NSString * _Nonnull (^ _Nonnull)(void (^ _Nonnull completionHandler)(NSString * _Nonnull responseText)))command OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithCommand:(NSString * _Nonnull (^ _Nonnull)(void (^ _Nonnull)(NSString * _Nonnull)))command OBJC_DESIGNATED_INITIALIZER; - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)loadView; - (void)viewDidLoad; +- (nonnull instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil SWIFT_UNAVAILABLE; @end @class UIActivityViewController; @interface CommandResponseViewController (SWIFT_EXTENSION(LoopKit)) - (id _Nonnull)activityViewControllerPlaceholderItem:(UIActivityViewController * _Nonnull)activityViewController; -- (id _Nullable)activityViewController:(UIActivityViewController * _Nonnull)activityViewController itemForActivityType:(NSString * _Nonnull)activityType; -- (NSString * _Nonnull)activityViewController:(UIActivityViewController * _Nonnull)activityViewController subjectForActivityType:(NSString * _Nullable)activityType; +- (id _Nullable)activityViewController:(UIActivityViewController * _Nonnull)activityViewController itemForActivityType:(UIActivityType _Nonnull)activityType; +- (NSString * _Nonnull)activityViewController:(UIActivityViewController * _Nonnull)activityViewController subjectForActivityType:(UIActivityType _Nullable)activityType; @end @class UIBarButtonItem; -@class NSTimeZone; @class UITableView; -@class NSIndexPath; @class UITableViewCell; SWIFT_CLASS("_TtC7LoopKit37DailyValueScheduleTableViewController") @@ -132,7 +150,7 @@ SWIFT_CLASS("_TtC7LoopKit37DailyValueScheduleTableViewController") - (void)setEditing:(BOOL)editing animated:(BOOL)animated; - (void)viewWillDisappear:(BOOL)animated; - (UIBarButtonItem * _Nonnull)insertButtonItem; -@property (nonatomic, strong) NSTimeZone * _Nonnull timeZone; +@property (nonatomic, copy) NSTimeZone * _Nonnull timeZone; @property (nonatomic, copy) NSString * _Nonnull unitDisplayString; - (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView; - (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section; @@ -146,6 +164,8 @@ SWIFT_CLASS("_TtC7LoopKit37DailyValueScheduleTableViewController") - (void)tableView:(UITableView * _Nonnull)tableView didDeselectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (void)tableView:(UITableView * _Nonnull)tableView didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (NSIndexPath * _Nonnull)tableView:(UITableView * _Nonnull)tableView targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath * _Nonnull)sourceIndexPath toProposedIndexPath:(NSIndexPath * _Nonnull)proposedDestinationIndexPath; +- (nonnull instancetype)initWithStyle:(UITableViewStyle)style SWIFT_UNAVAILABLE; +- (nonnull instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil SWIFT_UNAVAILABLE; @end @@ -208,31 +228,22 @@ SWIFT_CLASS("_TtC7LoopKit39GlucoseRangeScheduleTableViewController") @interface HKUnit (SWIFT_EXTENSION(LoopKit)) + (HKUnit * _Nonnull)milligramsPerDeciliterUnit; + (HKUnit * _Nonnull)millimolesPerLiterUnit; - -/// A formatting helper for determining the preferred decimal style for a given unit +/** + A formatting helper for determining the preferred decimal style for a given unit +*/ @property (nonatomic, readonly) NSInteger preferredMinimumFractionDigits; - -/// A presentation helper for the localized unit string +/** + A presentation helper for the localized unit string +*/ @property (nonatomic, readonly, copy) NSString * _Nonnull glucoseUnitDisplayString; @end -@interface NSDate (SWIFT_EXTENSION(LoopKit)) -@end - - -@interface NSDate (SWIFT_EXTENSION(LoopKit)) -- (NSDate * _Nonnull)dateFlooredToTimeInterval:(NSTimeInterval)interval; -- (NSDate * _Nonnull)dateCeiledToTimeInterval:(NSTimeInterval)interval; -@end - - @class UITextField; -@class NSBundle; SWIFT_CLASS("_TtC7LoopKit28TextFieldTableViewController") @interface TextFieldTableViewController : UITableViewController -@property (nonatomic, strong) NSIndexPath * _Nullable indexPath; +@property (nonatomic, copy) NSIndexPath * _Nullable indexPath; @property (nonatomic, copy) NSString * _Nullable placeholder; @property (nonatomic, copy) NSString * _Nullable unit; @property (nonatomic, copy) NSString * _Nullable value; @@ -257,28 +268,39 @@ SWIFT_CLASS("_TtC7LoopKit28TextFieldTableViewController") @interface UIViewController (SWIFT_EXTENSION(LoopKit)) +/** + Convenience method to present an alert controller on the active view controller + \param title The title of the alert + + \param message The message of the alert + + \param animated Whether to animate the alert -/// Convenience method to present an alert controller on the active view controller -/// -/// \param title The title of the alert -/// -/// \param message The message of the alert -/// -/// \param animated Whether to animate the alert -/// -/// \param completion An optional closure to execute after the presentation finishes + \param completion An optional closure to execute after the presentation finishes + +*/ - (void)presentAlertControllerWithTitle:(NSString * _Nullable)title message:(NSString * _Nonnull)message animated:(BOOL)animated completion:(void (^ _Nullable)(void))completion; +/** + Convenience method to display an error object in an alert controller + \param error The error to display + + \param animated Whether to animate the alert + + \param completion An optional closure to execute after the presentation finishes + +*/ +- (void)presentAlertControllerWith:(NSError * _Nonnull)error animated:(BOOL)animated completion:(void (^ _Nullable)(void))completion; +/** + Convenience method to present a view controller on the active view controller. + If the receiver is not in a window, or already has a presented view controller, this method will + attempt to find the most appropriate view controller for presenting. + \param viewControllerToPresent The view controller to display over the view controller’s content + + \param animated Whether to animate the presentation + + \param completion An optional closure to execute after the presentation finishes -/// Convenience method to present a view controller on the active view controller. -/// -/// If the receiver is not in a window, or already has a presented view controller, this method will -/// attempt to find the most appropriate view controller for presenting. -/// -/// \param viewControllerToPresent The view controller to display over the view controller’s content -/// -/// \param animated Whether to animate the presentation -/// -/// \param completion An optional closure to execute after the presentation finishes +*/ - (void)presentViewControllerOnActiveViewController:(UIViewController * _Nonnull)viewControllerToPresent animated:(BOOL)animated completion:(void (^ _Nullable)(void))completion; @end diff --git a/Carthage/Build/iOS/LoopKit.framework/Info.plist b/Carthage/Build/iOS/LoopKit.framework/Info.plist index c7528d7c9f..7d2b1c3c86 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Info.plist and b/Carthage/Build/iOS/LoopKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/LoopKit.framework/LoopKit b/Carthage/Build/iOS/LoopKit.framework/LoopKit index 95ec550f32..ef7ad31ed3 100755 Binary files a/Carthage/Build/iOS/LoopKit.framework/LoopKit and b/Carthage/Build/iOS/LoopKit.framework/LoopKit differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc index 6ae85d6736..7cfcc9b881 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule index 38b9949719..4cbbedc3e5 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc index d63c3fee9e..4fdc27927d 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule index 1923bb86a5..90cbb81c8f 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc index 9363230869..998e425a89 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule index 8fbef80f7e..05646b748a 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc index 0f5bd7822a..c791f9582e 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule index 9743acfa11..793642bbee 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib index 3e689b0efe..7c1d79915a 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib index 73c5b70171..83aef0b927 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h index bd847d75a6..501ca8fe81 100644 --- a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h +++ b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import Foundation; #endif @@ -98,14 +116,6 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" -@interface NSData (SWIFT_EXTENSION(MinimedKit)) -@end - - -@interface NSDateComponents (SWIFT_EXTENSION(MinimedKit)) -@end - - @interface NSDateFormatter (SWIFT_EXTENSION(MinimedKit)) @end diff --git a/Carthage/Build/iOS/MinimedKit.framework/Info.plist b/Carthage/Build/iOS/MinimedKit.framework/Info.plist index 85aec27cf2..fbba4fd874 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Info.plist and b/Carthage/Build/iOS/MinimedKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit index 32d3faa91f..5fbaaabb01 100755 Binary files a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit and b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc index dbb6d000c7..fe171d96f9 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule index b3626851cb..866fd32711 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc index f994dc7584..3d0eb1b2d0 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule index 7592fa1462..e17bb51106 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc index dfe14c0346..6ddf2fa397 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule index 99429018d5..66d0865490 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc index a884bb4d7e..c73fbb0656 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule index fdd4dff128..cfc256846e 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h index f5d5c5e689..73da02e852 100644 --- a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h +++ b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,19 +106,22 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) -@import HealthKit; @import Foundation; +@import HealthKit; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" -@interface HKUnit (SWIFT_EXTENSION(NightscoutUploadKit)) +@interface NSDateFormatter (SWIFT_EXTENSION(NightscoutUploadKit)) @end -@interface NSDateFormatter (SWIFT_EXTENSION(NightscoutUploadKit)) +@interface HKUnit (SWIFT_EXTENSION(NightscoutUploadKit)) @end diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist index b11fa077f8..27a4298e0d 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc index 8bbab6e464..80c754c0fe 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule index c54df160bc..c287aa837d 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc index 46112ca328..c710032fec 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule index fa41f84a35..177889fa77 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc index 3e6a37f0b5..c7463c51de 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule index 0e5057945a..0653dd1ba4 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc index 313c9cf46b..a98afbbfdb 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule index 5a23fec5df..1088102d8c 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit index dfe2139fac..1d50ca0573 100755 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit and b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h index 4eda731574..41cd909758 100644 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h +++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h @@ -44,6 +44,7 @@ typedef NS_ENUM(NSUInteger, SubgRfspyVersionState) { #define CC111X_REG_MDMCFG2 0x0E #define CC111X_REG_MDMCFG1 0x0F #define CC111X_REG_MDMCFG0 0x10 +#define CC111X_REG_DEVIATN 0x11 #define CC111X_REG_AGCCTRL2 0x17 #define CC111X_REG_AGCCTRL1 0x18 #define CC111X_REG_AGCCTRL0 0x19 diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist index 42d12e9b38..cc0046ee10 100644 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit index 0043318d6d..b06f17e882 100755 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h index 44deb45782..62b7d93f2d 100644 --- a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h +++ b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,17 +106,16 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) -@import Foundation; @import UIKit; +@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" - -@interface NSData (SWIFT_EXTENSION(RileyLinkKit)) -@end - @class UINib; @class UISwitch; @class NSCoder; @@ -116,11 +130,11 @@ SWIFT_CLASS("_TtC12RileyLinkKit28RileyLinkDeviceTableViewCell") @end @class UITableView; -@class NSIndexPath; @class NSBundle; SWIFT_CLASS("_TtC12RileyLinkKit34RileyLinkDeviceTableViewController") @interface RileyLinkDeviceTableViewController : UITableViewController +- (nonnull instancetype)init SWIFT_UNAVAILABLE; - (void)viewDidLoad; - (void)viewWillAppear:(BOOL)animated; - (void)viewWillDisappear:(BOOL)animated; diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist index 3bc3927a5a..6568d56961 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc index c3a07301b0..c40353d126 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule index d37541c574..5567271684 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc index 1571a95d2d..41c1c51353 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule index e74aacc281..7c75294c9a 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc index e4de307443..fea945baf2 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule index b26f85ff6d..8913b8775a 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc index 02f8c8f9aa..7380b39541 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule index 85817e410f..00a31c985e 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib index 385f5215d4..2003c2e8bf 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit index d8dd82e8be..e0d1324bfb 100755 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib index 3fc13fbb98..0e4156cf66 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h index f6f83153b0..61a199d2ee 100644 --- a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h +++ b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) #endif diff --git a/Carthage/Build/iOS/ShareClient.framework/Info.plist b/Carthage/Build/iOS/ShareClient.framework/Info.plist index 85194c958c..6645632b32 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Info.plist and b/Carthage/Build/iOS/ShareClient.framework/Info.plist differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc index bc49e956d1..1a90185d70 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule index cb62ac98b6..8d1b44f84a 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc index d6ffa01050..65142c96f9 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule index 4c0eae745e..b82e19ed4b 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc index e226d82f80..d28076f8df 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule index 119f89ee67..93dbd75d26 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc index 472c75946c..7ccd7ac740 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule index 30977dd619..b51990e05b 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/ShareClient b/Carthage/Build/iOS/ShareClient.framework/ShareClient index ac6252b041..d33f47e230 100755 Binary files a/Carthage/Build/iOS/ShareClient.framework/ShareClient and b/Carthage/Build/iOS/ShareClient.framework/ShareClient differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h index c03e6be149..48880875db 100644 --- a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h +++ b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; @import CoreGraphics; @@ -103,6 +121,7 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); SWIFT_CLASS("_TtC11SwiftCharts14ChartAreasView") @interface ChartAreasView : UIView - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -113,8 +132,9 @@ SWIFT_CLASS("_TtC11SwiftCharts9ChartView") @end - -/// A UIView subclass for drawing charts +/** + A UIView subclass for drawing charts +*/ SWIFT_CLASS("_TtC11SwiftCharts13ChartBaseView") @interface ChartBaseView : ChartView - (void)drawRect:(CGRect)rect; @@ -129,12 +149,14 @@ SWIFT_CLASS("_TtC11SwiftCharts20ChartCandleStickView") - (nonnull instancetype)initWithLineX:(CGFloat)lineX width:(CGFloat)width top:(CGFloat)top bottom:(CGFloat)bottom innerRectTop:(CGFloat)innerRectTop innerRectBottom:(CGFloat)innerRectBottom fillColor:(UIColor * _Nonnull)fillColor strokeColor:(UIColor * _Nonnull)strokeColor strokeWidth:(CGFloat)strokeWidth OBJC_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)drawRect:(CGRect)rect; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end SWIFT_CLASS("_TtC11SwiftCharts14ChartLinesView") @interface ChartLinesView : UIView - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @class UITouch; @@ -157,6 +179,7 @@ SWIFT_CLASS("_TtC11SwiftCharts21ChartPointEllipseView") - (void)didMoveToSuperview; - (void)drawRect:(CGRect)rect; - (void)touchesEnded:(NSSet * _Nonnull)touches withEvent:(UIEvent * _Nullable)event; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -164,6 +187,7 @@ SWIFT_CLASS("_TtC11SwiftCharts23ChartPointTargetingView") @interface ChartPointTargetingView : UIView - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)didMoveToSuperview; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -174,6 +198,7 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointTextCircleView") - (void)didMoveToSuperview; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)touchesEnded:(NSSet * _Nonnull)touches withEvent:(UIEvent * _Nullable)event; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -182,6 +207,7 @@ SWIFT_CLASS("_TtC11SwiftCharts17ChartPointViewBar") - (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration OBJC_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)didMoveToSuperview; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -189,6 +215,7 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarGreyOut") @interface ChartPointViewBarGreyOut : ChartPointViewBar - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)didMoveToSuperview; +- (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration SWIFT_UNAVAILABLE; @end @@ -196,6 +223,7 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarStacked") @interface ChartPointViewBarStacked : ChartPointViewBar - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)drawRect:(CGRect)rect; +- (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration SWIFT_UNAVAILABLE; @end @@ -227,6 +255,7 @@ SWIFT_CLASS("_TtC11SwiftCharts10InfoBubble") - (nonnull instancetype)initWithFrame:(CGRect)frame arrowWidth:(CGFloat)arrowWidth arrowHeight:(CGFloat)arrowHeight bgColor:(UIColor * _Nonnull)bgColor arrowX:(CGFloat)arrowX OBJC_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)drawRect:(CGRect)rect; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist b/Carthage/Build/iOS/SwiftCharts.framework/Info.plist index be98d53443..44a3c3bdfa 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist and b/Carthage/Build/iOS/SwiftCharts.framework/Info.plist differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc index f7613d6671..d73c32155a 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule index f07c2d1139..395cd5ebdc 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc index b2de65033f..7de518b74b 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule index 9282c513c3..fa854545d9 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc index 26b3778e52..e640c3c77e 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule index a34fb834dc..76986926de 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc index 02d5829d5d..a24beca8a1 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule index e52c2822af..26c821bd17 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts b/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts index 9afcad7f3f..5a67acbc3b 100755 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts and b/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h index 679d40c30e..d2729bf59c 100644 --- a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h +++ b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,9 +106,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import HealthKit; -@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" @@ -102,12 +119,4 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); @interface HKUnit (SWIFT_EXTENSION(xDripG5)) @end - -@interface NSData (SWIFT_EXTENSION(xDripG5)) -@end - - -@interface NSData (SWIFT_EXTENSION(xDripG5)) -@end - #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-umbrella.h b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-umbrella.h deleted file mode 100644 index b883d87b46..0000000000 --- a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-umbrella.h +++ /dev/null @@ -1,8 +0,0 @@ -#import - -#import "xDripG5.h" -#import "AESCrypt.h" - -FOUNDATION_EXPORT double xDripG5VersionNumber; -FOUNDATION_EXPORT const unsigned char xDripG5VersionString[]; - diff --git a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5.h b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5.h index 63dab44519..3b949160bf 100644 --- a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5.h +++ b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5.h @@ -2,9 +2,16 @@ // xDripG5.h // xDripG5 // -// Created by Nathan Racklyeft on 12/31/15. +// Created by Nathan Racklyeft on 12/30/15. // Copyright © 2015 Nathan Racklyeft. All rights reserved. // +#import +#import + +//! Project version number for xDripG5. +FOUNDATION_EXPORT double xDripG5VersionNumber; + +//! Project version string for xDripG5. +FOUNDATION_EXPORT const unsigned char xDripG5VersionString[]; -#import \ No newline at end of file diff --git a/Carthage/Build/iOS/xDripG5.framework/Info.plist b/Carthage/Build/iOS/xDripG5.framework/Info.plist index 1001556894..53ed8aad59 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Info.plist and b/Carthage/Build/iOS/xDripG5.framework/Info.plist differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/module.modulemap b/Carthage/Build/iOS/xDripG5.framework/Modules/module.modulemap index 38732da4e4..67b9c75e9f 100644 --- a/Carthage/Build/iOS/xDripG5.framework/Modules/module.modulemap +++ b/Carthage/Build/iOS/xDripG5.framework/Modules/module.modulemap @@ -1,5 +1,5 @@ framework module xDripG5 { - umbrella header "xDripG5-umbrella.h" + umbrella header "xDripG5.h" export * module * { export * } diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc index dfd68e81bb..e6a8cf276b 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule index 4ab3233234..80cb2d6a24 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc index 3f27394133..89ba4bf05d 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule index 3c746ce7fc..328d4b9479 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc index b3b5cb73d5..232a8141d9 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule index e0a2f93f65..7a2526ed3f 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc index 3c137295d4..0739ea1e55 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule index 60dde66c9f..ce914ded8e 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/xDripG5 b/Carthage/Build/iOS/xDripG5.framework/xDripG5 index a31aa1e303..0bad2351e4 100755 Binary files a/Carthage/Build/iOS/xDripG5.framework/xDripG5 and b/Carthage/Build/iOS/xDripG5.framework/xDripG5 differ diff --git a/DoseMathTests/DoseMathTests.swift b/DoseMathTests/DoseMathTests.swift index 51b11f692e..9b9a43cdb8 100644 --- a/DoseMathTests/DoseMathTests.swift +++ b/DoseMathTests/DoseMathTests.swift @@ -13,26 +13,26 @@ import LoopKit extension XCTestCase { - public var bundle: NSBundle { - return NSBundle(forClass: self.dynamicType) + public var bundle: Bundle { + return Bundle(for: type(of: self)) } - public func loadFixture(resourceName: String) -> T { - let path = bundle.pathForResource(resourceName, ofType: "json")! - return try! NSJSONSerialization.JSONObjectWithData(NSData(contentsOfFile: path)!, options: []) as! T + public func loadFixture(_ resourceName: String) -> T { + let path = bundle.path(forResource: resourceName, ofType: "json")! + return try! JSONSerialization.jsonObject(with: Data(contentsOf: URL(fileURLWithPath: path)), options: []) as! T } } -public typealias JSONDictionary = [String: AnyObject] +public typealias JSONDictionary = [String: Any] -extension NSDateFormatter { +extension DateFormatter { static func ISO8601LocalTimeDateFormatter() -> Self { let dateFormatter = self.init() dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss" - dateFormatter.locale = NSLocale(localeIdentifier: "en_US_POSIX") + dateFormatter.locale = Locale(identifier: "en_US_POSIX") return dateFormatter } @@ -40,10 +40,10 @@ extension NSDateFormatter { struct GlucoseFixtureValue: GlucoseValue { - let startDate: NSDate + let startDate: Date let quantity: HKQuantity - init(startDate: NSDate, quantity: HKQuantity) { + init(startDate: Date, quantity: HKQuantity) { self.startDate = startDate self.quantity = quantity } @@ -52,25 +52,25 @@ struct GlucoseFixtureValue: GlucoseValue { class RecommendTempBasalTests: XCTestCase { - private let maxBasalRate = 3.0 + fileprivate let maxBasalRate = 3.0 - func loadGlucoseValueFixture(resourceName: String) -> [GlucoseValue] { + func loadGlucoseValueFixture(_ resourceName: String) -> [GlucoseValue] { let fixture: [JSONDictionary] = loadFixture(resourceName) - let dateFormatter = NSDateFormatter.ISO8601LocalTimeDateFormatter() + let dateFormatter = DateFormatter.ISO8601LocalTimeDateFormatter() return fixture.map { return GlucoseFixtureValue( - startDate: dateFormatter.dateFromString($0["date"] as! String)!, + startDate: dateFormatter.date(from: $0["date"] as! String)!, quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double) ) } } - func loadBasalRateScheduleFixture(resourceName: String) -> BasalRateSchedule { + func loadBasalRateScheduleFixture(_ resourceName: String) -> BasalRateSchedule { let fixture: [JSONDictionary] = loadFixture(resourceName) let items = fixture.map { - return RepeatingScheduleValue(startTime: NSTimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) + return RepeatingScheduleValue(startTime: TimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) } return BasalRateSchedule(dailyItems: items)! @@ -81,7 +81,7 @@ class RecommendTempBasalTests: XCTestCase { } var glucoseTargetRange: GlucoseRangeSchedule { - return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: NSTimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)! + return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)! } var insulinSensitivitySchedule: InsulinSensitivitySchedule { @@ -120,8 +120,8 @@ class RecommendTempBasalTests: XCTestCase { // Cancel existing temp basal let lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 0.125, unit: .unitsPerHour ) @@ -136,7 +136,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testStartLowEndInRange() { @@ -152,7 +152,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, atDate: glucose.first!.startDate, @@ -168,8 +168,8 @@ class RecommendTempBasalTests: XCTestCase { let lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, unit: .unitsPerHour ) @@ -185,7 +185,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testCorrectLowAtMin() { @@ -201,13 +201,13 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Ignore due to existing dose var lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 0.125, unit: .unitsPerHour ) @@ -226,8 +226,8 @@ class RecommendTempBasalTests: XCTestCase { // Cancel existing dose lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, unit: .unitsPerHour ) @@ -242,13 +242,13 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Continue existing dose lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -21)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 9)), value: 0.125, unit: .unitsPerHour ) @@ -263,7 +263,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Allow predictive temp below range dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -280,8 +280,8 @@ class RecommendTempBasalTests: XCTestCase { lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -21)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 9)), value: 0.125, unit: .unitsPerHour ) @@ -297,7 +297,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testStartHighEndLow() { @@ -313,7 +313,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testStartLowEndHigh() { @@ -329,7 +329,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Allow predictive temp below range dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -346,8 +346,8 @@ class RecommendTempBasalTests: XCTestCase { let lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, unit: .unitsPerHour ) @@ -363,7 +363,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testFlatAndHigh() { @@ -379,7 +379,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(3.0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testHighAndFalling() { @@ -395,7 +395,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(1.425, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testInRangeAndRising() { @@ -411,7 +411,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(1.475, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testHighAndRising() { @@ -427,7 +427,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(3.0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Use mmol sensitivity value let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])! @@ -442,7 +442,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(2.975, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testNoInputGlucose() { @@ -461,25 +461,25 @@ class RecommendTempBasalTests: XCTestCase { class RecommendBolusTests: XCTestCase { - private let maxBolus = 10.0 + fileprivate let maxBolus = 10.0 - func loadGlucoseValueFixture(resourceName: String) -> [GlucoseValue] { + func loadGlucoseValueFixture(_ resourceName: String) -> [GlucoseValue] { let fixture: [JSONDictionary] = loadFixture(resourceName) - let dateFormatter = NSDateFormatter.ISO8601LocalTimeDateFormatter() + let dateFormatter = DateFormatter.ISO8601LocalTimeDateFormatter() return fixture.map { return GlucoseFixtureValue( - startDate: dateFormatter.dateFromString($0["date"] as! String)!, + startDate: dateFormatter.date(from: $0["date"] as! String)!, quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double) ) } } - func loadBasalRateScheduleFixture(resourceName: String) -> BasalRateSchedule { + func loadBasalRateScheduleFixture(_ resourceName: String) -> BasalRateSchedule { let fixture: [JSONDictionary] = loadFixture(resourceName) let items = fixture.map { - return RepeatingScheduleValue(startTime: NSTimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) + return RepeatingScheduleValue(startTime: TimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) } return BasalRateSchedule(dailyItems: items)! @@ -490,7 +490,7 @@ class RecommendBolusTests: XCTestCase { } var glucoseTargetRange: GlucoseRangeSchedule { - return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: NSTimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)! + return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)! } var insulinSensitivitySchedule: InsulinSensitivitySchedule { @@ -529,8 +529,8 @@ class RecommendBolusTests: XCTestCase { // Don't consider net-negative temp basal let lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 0.01, unit: .unitsPerHour ) @@ -639,8 +639,8 @@ class RecommendBolusTests: XCTestCase { // Less existing temp var lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, unit: .unitsPerHour ) @@ -659,8 +659,8 @@ class RecommendBolusTests: XCTestCase { // But not a finished temp lastTempBasal = DoseEntry( type: .tempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -35)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -5)), + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -35)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -5)), value: 1.225, unit: .unitsPerHour ) diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index aba48cb9fb..5e56806c92 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 48; objects = { /* Begin PBXBuildFile section */ @@ -13,6 +13,7 @@ 4302F4E51D4EA75100F0FCAF /* DoseStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E41D4EA75100F0FCAF /* DoseStore.swift */; }; 430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; }; 430DA5901D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */; }; + 4313EDE01D8A6BF90060FA79 /* ChartContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */; }; 4315D2871CA5CC3B00589052 /* CarbEntryEditTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */; }; 4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4315D2891CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift */; }; 4328E0181CFBE1DA00E199AA /* ContextInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0131CFBE1DA00E199AA /* ContextInterfaceController.swift */; }; @@ -72,6 +73,7 @@ 438849EA1D297CB6003B3F23 /* NightscoutService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849E91D297CB6003B3F23 /* NightscoutService.swift */; }; 438849EC1D29EC34003B3F23 /* AmplitudeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */; }; 438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849ED1D2A1EBB003B3F23 /* MLabService.swift */; }; + 438A95A81D8B9B24009D12E1 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 438A95A71D8B9B24009D12E1 /* xDripG5.framework */; }; 438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */; }; 438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */; }; 438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */; }; @@ -91,6 +93,7 @@ 43B371861CE583890013C5A6 /* BasalStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B371851CE583890013C5A6 /* BasalStateView.swift */; }; 43B371881CE597D10013C5A6 /* ShareClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43B371871CE597D10013C5A6 /* ShareClient.framework */; }; 43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C094491CACCC73001F6403 /* NotificationManager.swift */; }; + 43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C246A71D89990F0031F8D1 /* Crypto.framework */; }; 43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */; }; 43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CA93361CB98079000026B5 /* MinimedKit.framework */; }; 43CE7CDE1CA8B63E003CC1B0 /* NSDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */; }; @@ -131,7 +134,6 @@ 43EA28601D50ED4D001BC233 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; }; 43EA28621D517E42001BC233 /* SensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA28611D517E42001BC233 /* SensorDisplayable.swift */; }; 43EB40861C82646A00472A8C /* StatusChartManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EB40851C82646A00472A8C /* StatusChartManager.swift */; }; - 43EDDBF31C361C75007D89B5 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43EDDBF11C361C75007D89B5 /* xDripG5.framework */; }; 43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */; }; 43F41C351D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */; }; 43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C361D3BF32400C11ED6 /* UIAlertController.swift */; }; @@ -239,6 +241,7 @@ 4302F4E41D4EA75100F0FCAF /* DoseStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DoseStore.swift; sourceTree = ""; }; 430DA58D1D4AEC230097D1CA /* NSBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSBundle.swift; sourceTree = ""; }; 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySentryPumpStatusMessageBody.swift; sourceTree = ""; }; + 4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartContentView.swift; sourceTree = ""; }; 4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryEditTableViewController.swift; sourceTree = ""; }; 4315D2891CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DiagnosticLogger+LoopKit.swift"; sourceTree = ""; }; 4328E0131CFBE1DA00E199AA /* ContextInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextInterfaceController.swift; sourceTree = ""; }; @@ -297,6 +300,7 @@ 438849E91D297CB6003B3F23 /* NightscoutService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutService.swift; sourceTree = ""; }; 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmplitudeService.swift; sourceTree = ""; }; 438849ED1D2A1EBB003B3F23 /* MLabService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MLabService.swift; sourceTree = ""; }; + 438A95A71D8B9B24009D12E1 /* xDripG5.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = xDripG5.framework; path = Carthage/Build/iOS/xDripG5.framework; sourceTree = ""; }; 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionInputEffect.swift; sourceTree = ""; }; 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionInputEffectTableViewCell.swift; sourceTree = ""; }; 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopStateView.swift; sourceTree = ""; }; @@ -318,6 +322,7 @@ 43B371851CE583890013C5A6 /* BasalStateView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasalStateView.swift; sourceTree = ""; }; 43B371871CE597D10013C5A6 /* ShareClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ShareClient.framework; path = Carthage/Build/iOS/ShareClient.framework; sourceTree = ""; }; 43C094491CACCC73001F6403 /* NotificationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = ""; }; + 43C246A71D89990F0031F8D1 /* Crypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crypto.framework; path = Carthage/Build/iOS/Crypto.framework; sourceTree = ""; }; 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ShareGlucose+GlucoseKit.swift"; sourceTree = ""; }; 43CA93361CB98079000026B5 /* MinimedKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MinimedKit.framework; path = Carthage/Build/iOS/MinimedKit.framework; sourceTree = ""; }; 43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDate.swift; sourceTree = ""; }; @@ -355,10 +360,6 @@ 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseTrend.swift; sourceTree = ""; }; 43EA28611D517E42001BC233 /* SensorDisplayable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SensorDisplayable.swift; sourceTree = ""; }; 43EB40851C82646A00472A8C /* StatusChartManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusChartManager.swift; sourceTree = ""; }; - 43EDDBF01C361C75007D89B5 /* CommonCrypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CommonCrypto.framework; path = Carthage/Build/iOS/CommonCrypto.framework; sourceTree = ""; }; - 43EDDBF11C361C75007D89B5 /* xDripG5.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = xDripG5.framework; path = Carthage/Build/iOS/xDripG5.framework; sourceTree = ""; }; - 43EDDBF51C361D24007D89B5 /* CommonCrypto.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = CommonCrypto.framework.dSYM; path = Carthage/Build/iOS/CommonCrypto.framework.dSYM; sourceTree = ""; }; - 43EDDBF61C361D24007D89B5 /* xDripG5.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = xDripG5.framework.dSYM; path = Carthage/Build/iOS/xDripG5.framework.dSYM; sourceTree = ""; }; 43EDEE6B1CF2E12A00393BE3 /* Loop.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Loop.entitlements; sourceTree = ""; }; 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartAxisValueDoubleUnit.swift; sourceTree = ""; }; 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsTouchHighlightLayerViewCache.swift; sourceTree = ""; }; @@ -394,6 +395,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 438A95A81D8B9B24009D12E1 /* xDripG5.framework in Frameworks */, + 43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */, 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */, C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */, 43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */, @@ -406,7 +409,6 @@ 43523EDB1CC35083001850F1 /* RileyLinkKit.framework in Frameworks */, 43B371881CE597D10013C5A6 /* ShareClient.framework in Frameworks */, 4346D1F01C781BEA00ABAFE3 /* SwiftCharts.framework in Frameworks */, - 43EDDBF31C361C75007D89B5 /* xDripG5.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -657,6 +659,7 @@ 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */, 437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */, 434F54581D28805E002A9274 /* ButtonTableViewCell.xib */, + 4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */, 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */, 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */, 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */, @@ -704,23 +707,21 @@ 968DCD53F724DE56FFE51920 /* Frameworks */ = { isa = PBXGroup; children = ( + 438A95A71D8B9B24009D12E1 /* xDripG5.framework */, 434FB6451D68F1CD007B9C70 /* Amplitude.framework */, - C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */, - 43B371871CE597D10013C5A6 /* ShareClient.framework */, 43F78D481C914197002152D1 /* CarbKit.framework */, - 43EDDBF01C361C75007D89B5 /* CommonCrypto.framework */, - 43EDDBF51C361D24007D89B5 /* CommonCrypto.framework.dSYM */, + 43C246A71D89990F0031F8D1 /* Crypto.framework */, 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */, 43F78D491C914197002152D1 /* GlucoseKit.framework */, 43F5C2C81B929C09003EB13D /* HealthKit.framework */, 43F78D4A1C914197002152D1 /* InsulinKit.framework */, 43F78D4B1C914197002152D1 /* LoopKit.framework */, 43CA93361CB98079000026B5 /* MinimedKit.framework */, + C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */, 434AB0B11CBB4C3300422F4A /* RileyLinkBLEKit.framework */, 43523EDA1CC35083001850F1 /* RileyLinkKit.framework */, + 43B371871CE597D10013C5A6 /* ShareClient.framework */, 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */, - 43EDDBF11C361C75007D89B5 /* xDripG5.framework */, - 43EDDBF61C361D24007D89B5 /* xDripG5.framework.dSYM */, ); name = Frameworks; sourceTree = ""; @@ -828,11 +829,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = "Nathan Racklyeft"; TargetAttributes = { 43776F8B1B8022E90074EA36 = { CreatedOnToolsVersion = 7.0; + LastSwiftMigration = 0800; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 0; @@ -850,6 +852,7 @@ }; 43A943711B926B7B0051FA24 = { CreatedOnToolsVersion = 7.0; + LastSwiftMigration = 0800; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 0; @@ -858,6 +861,7 @@ }; 43A9437D1B926B7B0051FA24 = { CreatedOnToolsVersion = 7.0; + LastSwiftMigration = 0800; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 0; @@ -872,15 +876,17 @@ }; 43E2D8D01D20BF42004DA55F = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 0800; }; 43E2D90A1D20C581004DA55F = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 0800; TestTargetID = 43776F8B1B8022E90074EA36; }; }; }; buildConfigurationList = 43776F871B8022E90074EA36 /* Build configuration list for PBXProject "Loop" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 8.0"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -965,7 +971,6 @@ files = ( ); inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/CommonCrypto.framework", "$(SRCROOT)/Carthage/Build/iOS/xDripG5.framework", "$(SRCROOT)/Carthage/Build/iOS/CarbKit.framework", "$(SRCROOT)/Carthage/Build/iOS/GlucoseKit.framework", @@ -1003,6 +1008,7 @@ 43CE7CDE1CA8B63E003CC1B0 /* NSDate.swift in Sources */, 43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */, 43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */, + 4313EDE01D8A6BF90060FA79 /* ChartContentView.swift in Sources */, 43B371861CE583890013C5A6 /* BasalStateView.swift in Sources */, 434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */, 437CCADE1D2858FD0075D2C3 /* AuthenticationViewController.swift in Sources */, @@ -1185,13 +1191,15 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1215,6 +1223,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = "-Wall"; }; @@ -1234,13 +1243,15 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1257,6 +1268,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = "-Wall"; @@ -1266,10 +1278,11 @@ 43776FB71B8022E90074EA36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = 57NRR26737; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -1285,10 +1298,11 @@ 43776FB81B8022E90074EA36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = 57NRR26737; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -1306,6 +1320,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 57NRR26737; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension"; @@ -1322,6 +1337,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 57NRR26737; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension"; @@ -1336,10 +1352,11 @@ 43A9439A1B926B7B0051FA24 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = 57NRR26737; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1355,10 +1372,11 @@ 43A9439B1B926B7B0051FA24 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = 57NRR26737; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme index 81a7325f8e..f309168528 100644 --- a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme +++ b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { window?.tintColor = UIColor.tintColor NotificationManager.authorize() @@ -25,51 +25,51 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { return true } - func applicationWillResignActive(application: UIApplication) { + func applicationWillResignActive(_ application: UIApplication) { // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. } - func applicationDidEnterBackground(application: UIApplication) { + func applicationDidEnterBackground(_ application: UIApplication) { // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. } - func applicationWillEnterForeground(application: UIApplication) { + func applicationWillEnterForeground(_ application: UIApplication) { // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. } - func applicationDidBecomeActive(application: UIApplication) { + func applicationDidBecomeActive(_ application: UIApplication) { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. DeviceDataManager.sharedManager.transmitter?.resumeScanning() } - func applicationWillTerminate(application: UIApplication) { + func applicationWillTerminate(_ application: UIApplication) { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - func applicationShouldRequestHealthAuthorization(application: UIApplication) { + func applicationShouldRequestHealthAuthorization(_ application: UIApplication) { } // MARK: - Notifications - func application(application: UIApplication, didReceiveLocalNotification notification: UILocalNotification) { - if application.applicationState == .Active { + func application(_ application: UIApplication, didReceive notification: UILocalNotification) { + if application.applicationState == .active { if let message = notification.alertBody { - window?.rootViewController?.presentAlertControllerWithTitle(notification.alertTitle, message: message, animated: true, completion: nil) + window?.rootViewController?.presentAlertController(withTitle: notification.alertTitle, message: message, animated: true, completion: nil) } } } - func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forLocalNotification notification: UILocalNotification, withResponseInfo responseInfo: [NSObject : AnyObject], completionHandler: () -> Void) { + func application(_ application: UIApplication, handleActionWithIdentifier identifier: String?, for notification: UILocalNotification, withResponseInfo responseInfo: [AnyHashable: Any], completionHandler: @escaping () -> Void) { switch identifier { case NotificationManager.Action.RetryBolus.rawValue?: - if let units = notification.userInfo?[NotificationManager.UserInfoKey.BolusAmount.rawValue] as? Double, - startDate = notification.userInfo?[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? NSDate where - startDate.timeIntervalSinceNow >= NSTimeInterval(minutes: -5) + if let units = notification.userInfo?[NotificationManager.UserInfoKey.BolusAmount.rawValue] as? Double, + let startDate = notification.userInfo?[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? Date, + startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5) { AnalyticsManager.sharedManager.didRetryBolus() @@ -91,7 +91,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { // MARK: - 3D Touch - func application(application: UIApplication, performActionForShortcutItem shortcutItem: UIApplicationShortcutItem, completionHandler: (Bool) -> Void) { + func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) { completionHandler(false) } } diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json b/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json index 3ca2983a71..d69bb9f635 100644 --- a/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -36,6 +46,16 @@ "filename" : "60@3x.png", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", diff --git a/Loop/Base.lproj/LaunchScreen.storyboard b/Loop/Base.lproj/LaunchScreen.storyboard index de140c4e2f..9e724c0695 100644 --- a/Loop/Base.lproj/LaunchScreen.storyboard +++ b/Loop/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -15,7 +16,7 @@ - + @@ -35,9 +36,9 @@ - + - + diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard index d7f3763134..f8dea28abc 100644 --- a/Loop/Base.lproj/Main.storyboard +++ b/Loop/Base.lproj/Main.storyboard @@ -1,10 +1,11 @@ - + - + + @@ -12,26 +13,23 @@ - + - + - + - + - - - + @@ -48,24 +46,24 @@ - + - + @@ -96,14 +94,11 @@ - - - + @@ -120,26 +115,24 @@ - + - + - + - + - - - + + - + - + - + @@ -195,23 +186,19 @@ - + - + - - - + @@ -270,28 +257,24 @@ - + - + - + - - - - + @@ -304,7 +287,7 @@ - + @@ -323,28 +306,23 @@ - - + @@ -381,29 +359,25 @@ - - - + - + @@ -425,28 +399,22 @@ - - - - - + - - + @@ -461,12 +429,11 @@ - + @@ -487,28 +454,22 @@ - - - - - + - - + @@ -521,7 +482,7 @@ - + @@ -541,7 +502,7 @@ - + @@ -551,36 +512,50 @@ - + - + - + - + + + + + + + + + + + + + + + @@ -635,38 +610,35 @@ - + - + - + - + @@ -682,20 +654,18 @@ - + - + - @@ -706,9 +676,8 @@ @@ -724,14 +693,13 @@ - + - +