diff --git a/.travis.yml b/.travis.yml index 5cd8db87..3b0aa6a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,7 @@ script: # Build cocoapods example project # - set -o pipefail && xcodebuild -workspace Example/xDripG5.xcworkspace -scheme xDripG5-Example -sdk iphonesimulator -destination name="iPhone SE" ONLY_ACTIVE_ARCH=NO | xcpretty # Build Travis project and run tests -- xcodebuild -project xDripG5.xcodeproj -scheme xDripG5 build -destination name="iPhone SE" test +- xcodebuild -project CGMBLEKit.xcodeproj -scheme CGMBLEKit build -destination name="iPhone SE" test +- xcodebuild -project CGMBLEKit.xcodeproj -scheme "CGMBLEKit Example" build -destination name="iPhone SE" +- xcodebuild -project CGMBLEKit.xcodeproj -scheme ResetTransmitter build -destination name="iPhone SE" # - pod lib lint diff --git a/CGMBLEKit Example/AppDelegate.swift b/CGMBLEKit Example/AppDelegate.swift index e872997d..70125e67 100644 --- a/CGMBLEKit Example/AppDelegate.swift +++ b/CGMBLEKit Example/AppDelegate.swift @@ -7,7 +7,7 @@ // import UIKit -import xDripG5 +import CGMBLEKit import CoreBluetooth @UIApplicationMain diff --git a/CGMBLEKit Example/CommandQueue.swift b/CGMBLEKit Example/CommandQueue.swift index 0f9c7b5f..b1aab75f 100644 --- a/CGMBLEKit Example/CommandQueue.swift +++ b/CGMBLEKit Example/CommandQueue.swift @@ -7,7 +7,7 @@ // import Foundation -import xDripG5 +import CGMBLEKit class CommandQueue { diff --git a/CGMBLEKit Example/ViewController.swift b/CGMBLEKit Example/ViewController.swift index 37a25b1d..4eadffdc 100644 --- a/CGMBLEKit Example/ViewController.swift +++ b/CGMBLEKit Example/ViewController.swift @@ -8,7 +8,7 @@ import UIKit import HealthKit -import xDripG5 +import CGMBLEKit class ViewController: UIViewController, TransmitterDelegate, UITextFieldDelegate { diff --git a/xDripG5.xcodeproj/project.pbxproj b/CGMBLEKit.xcodeproj/project.pbxproj similarity index 94% rename from xDripG5.xcodeproj/project.pbxproj rename to CGMBLEKit.xcodeproj/project.pbxproj index 50b75c1c..014673ce 100644 --- a/xDripG5.xcodeproj/project.pbxproj +++ b/CGMBLEKit.xcodeproj/project.pbxproj @@ -23,8 +23,8 @@ 433F2E57207928A200808FA5 /* ResetManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433F2E56207928A200808FA5 /* ResetManager.swift */; }; 433F2E5920792A0100808FA5 /* Locked.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433F2E5820792A0100808FA5 /* Locked.swift */; }; 433F2E5B2079747A00808FA5 /* CompletionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433F2E5A2079747A00808FA5 /* CompletionViewController.swift */; }; - 433F2E5C2079BB7D00808FA5 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* xDripG5.framework */; }; - 433F2E5D2079BB7D00808FA5 /* xDripG5.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* xDripG5.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 433F2E5C2079BB7D00808FA5 /* CGMBLEKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* CGMBLEKit.framework */; }; + 433F2E5D2079BB7D00808FA5 /* CGMBLEKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* CGMBLEKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 43460F88200B30D10030C0E3 /* TransmitterIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43460F87200B30D10030C0E3 /* TransmitterIDTests.swift */; }; 434B288320649D3C000EE07B /* ResetMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434B288220649D3C000EE07B /* ResetMessage.swift */; }; 435535D41FB2C1B000CE5A23 /* PeripheralManagerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435535D31FB2C1B000CE5A23 /* PeripheralManagerError.swift */; }; @@ -32,15 +32,15 @@ 437AFEFC2038EC43008C4892 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437AFEFB2038EC43008C4892 /* ViewController.swift */; }; 437AFF012038EC43008C4892 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 437AFF002038EC43008C4892 /* Assets.xcassets */; }; 437AFF042038EC43008C4892 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 437AFF022038EC43008C4892 /* LaunchScreen.storyboard */; }; - 437AFF122038EDEC008C4892 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* xDripG5.framework */; }; - 437AFF132038EDEC008C4892 /* xDripG5.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* xDripG5.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 437AFF122038EDEC008C4892 /* CGMBLEKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* CGMBLEKit.framework */; }; + 437AFF132038EDEC008C4892 /* CGMBLEKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* CGMBLEKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 437AFF182038EDF9008C4892 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43E3978C1D566AEA0028E321 /* HealthKit.framework */; }; 43846AC61D8F896C00799272 /* CalibrationDataRxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43846AC51D8F896C00799272 /* CalibrationDataRxMessage.swift */; }; 43846AC81D8F89BE00799272 /* CalibrationDataRxMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43846AC71D8F89BE00799272 /* CalibrationDataRxMessageTests.swift */; }; 43880F981D9E19FC009061A8 /* TransmitterVersionRxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43880F971D9E19FC009061A8 /* TransmitterVersionRxMessage.swift */; }; 43880F9A1D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43880F991D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift */; }; - 43CABDF71C3506F100005705 /* xDripG5.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CABDF61C3506F100005705 /* xDripG5.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 43CABDFE1C3506F100005705 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* xDripG5.framework */; }; + 43CABDF71C3506F100005705 /* CGMBLEKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CABDF61C3506F100005705 /* CGMBLEKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 43CABDFE1C3506F100005705 /* CGMBLEKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* CGMBLEKit.framework */; }; 43CABE121C350B2800005705 /* BluetoothManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CABE0E1C350B2800005705 /* BluetoothManager.swift */; }; 43CABE131C350B2800005705 /* BluetoothServices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CABE0F1C350B2800005705 /* BluetoothServices.swift */; }; 43CABE151C350B2800005705 /* Transmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CABE111C350B2800005705 /* Transmitter.swift */; }; @@ -125,7 +125,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 433F2E5D2079BB7D00808FA5 /* xDripG5.framework in Embed Frameworks */, + 433F2E5D2079BB7D00808FA5 /* CGMBLEKit.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -145,7 +145,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 437AFF132038EDEC008C4892 /* xDripG5.framework in Embed Frameworks */, + 437AFF132038EDEC008C4892 /* CGMBLEKit.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -184,10 +184,10 @@ 43846AC71D8F89BE00799272 /* CalibrationDataRxMessageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalibrationDataRxMessageTests.swift; sourceTree = ""; }; 43880F971D9E19FC009061A8 /* TransmitterVersionRxMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransmitterVersionRxMessage.swift; sourceTree = ""; }; 43880F991D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransmitterVersionRxMessageTests.swift; sourceTree = ""; }; - 43CABDF31C3506F100005705 /* xDripG5.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = xDripG5.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 43CABDF61C3506F100005705 /* xDripG5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xDripG5.h; sourceTree = ""; }; + 43CABDF31C3506F100005705 /* CGMBLEKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CGMBLEKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 43CABDF61C3506F100005705 /* CGMBLEKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CGMBLEKit.h; sourceTree = ""; }; 43CABDF81C3506F100005705 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 43CABDFD1C3506F100005705 /* xDripG5Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = xDripG5Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 43CABDFD1C3506F100005705 /* CGMBLEKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CGMBLEKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 43CABE041C3506F100005705 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 43CABE0E1C350B2800005705 /* BluetoothManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BluetoothManager.swift; sourceTree = ""; }; 43CABE0F1C350B2800005705 /* BluetoothServices.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BluetoothServices.swift; sourceTree = ""; }; @@ -243,7 +243,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 433F2E5C2079BB7D00808FA5 /* xDripG5.framework in Frameworks */, + 433F2E5C2079BB7D00808FA5 /* CGMBLEKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -252,7 +252,7 @@ buildActionMask = 2147483647; files = ( 437AFF182038EDF9008C4892 /* HealthKit.framework in Frameworks */, - 437AFF122038EDEC008C4892 /* xDripG5.framework in Frameworks */, + 437AFF122038EDEC008C4892 /* CGMBLEKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,7 +268,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 43CABDFE1C3506F100005705 /* xDripG5.framework in Frameworks */, + 43CABDFE1C3506F100005705 /* CGMBLEKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -328,8 +328,8 @@ isa = PBXGroup; children = ( 43E3978C1D566AEA0028E321 /* HealthKit.framework */, - 43CABDF51C3506F100005705 /* xDripG5 */, - 43CABE011C3506F100005705 /* xDripG5Tests */, + 43CABDF51C3506F100005705 /* CGMBLEKit */, + 43CABE011C3506F100005705 /* CGMBLEKitTests */, 437AFEF82038EC43008C4892 /* CGMBLEKit Example */, 43D140CD2047AA530032346D /* Common */, 4308103420785FEA00B66384 /* ResetTransmitter */, @@ -341,15 +341,15 @@ 43CABDF41C3506F100005705 /* Products */ = { isa = PBXGroup; children = ( - 43CABDF31C3506F100005705 /* xDripG5.framework */, - 43CABDFD1C3506F100005705 /* xDripG5Tests.xctest */, + 43CABDF31C3506F100005705 /* CGMBLEKit.framework */, + 43CABDFD1C3506F100005705 /* CGMBLEKitTests.xctest */, 437AFEF72038EC43008C4892 /* CGMBLEKit Example.app */, 4308103320785FEA00B66384 /* ResetTransmitter.app */, ); name = Products; sourceTree = ""; }; - 43CABDF51C3506F100005705 /* xDripG5 */ = { + 43CABDF51C3506F100005705 /* CGMBLEKit */ = { isa = PBXGroup; children = ( 43EEA70F1D14DC0800CBBDA0 /* AESCrypt.h */, @@ -370,13 +370,13 @@ 431CE7661F91D0B300255374 /* PeripheralManager+G5.swift */, 43CABE111C350B2800005705 /* Transmitter.swift */, 43CE7CDB1CA77468003CC1B0 /* TransmitterStatus.swift */, - 43CABDF61C3506F100005705 /* xDripG5.h */, + 43CABDF61C3506F100005705 /* CGMBLEKit.h */, 43CABE161C350B2E00005705 /* Messages */, ); - path = xDripG5; + path = CGMBLEKit; sourceTree = ""; }; - 43CABE011C3506F100005705 /* xDripG5Tests */ = { + 43CABE011C3506F100005705 /* CGMBLEKitTests */ = { isa = PBXGroup; children = ( 43846AC71D8F89BE00799272 /* CalibrationDataRxMessageTests.swift */, @@ -390,7 +390,7 @@ 43F82BCB1D035AA4006F5DD7 /* TransmitterTimeRxMessageTests.swift */, 43880F991D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift */, ); - path = xDripG5Tests; + path = CGMBLEKitTests; sourceTree = ""; }; 43CABE161C350B2E00005705 /* Messages */ = { @@ -443,7 +443,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 43CABDF71C3506F100005705 /* xDripG5.h in Headers */, + 43CABDF71C3506F100005705 /* CGMBLEKit.h in Headers */, 43EEA7111D14DC0800CBBDA0 /* AESCrypt.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -489,9 +489,9 @@ productReference = 437AFEF72038EC43008C4892 /* CGMBLEKit Example.app */; productType = "com.apple.product-type.application"; }; - 43CABDF21C3506F100005705 /* xDripG5 */ = { + 43CABDF21C3506F100005705 /* CGMBLEKit */ = { isa = PBXNativeTarget; - buildConfigurationList = 43CABE071C3506F100005705 /* Build configuration list for PBXNativeTarget "xDripG5" */; + buildConfigurationList = 43CABE071C3506F100005705 /* Build configuration list for PBXNativeTarget "CGMBLEKit" */; buildPhases = ( 43CABDEE1C3506F100005705 /* Sources */, 43CABDEF1C3506F100005705 /* Frameworks */, @@ -502,14 +502,14 @@ ); dependencies = ( ); - name = xDripG5; + name = CGMBLEKit; productName = xDripG5; - productReference = 43CABDF31C3506F100005705 /* xDripG5.framework */; + productReference = 43CABDF31C3506F100005705 /* CGMBLEKit.framework */; productType = "com.apple.product-type.framework"; }; - 43CABDFC1C3506F100005705 /* xDripG5Tests */ = { + 43CABDFC1C3506F100005705 /* CGMBLEKitTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 43CABE0A1C3506F100005705 /* Build configuration list for PBXNativeTarget "xDripG5Tests" */; + buildConfigurationList = 43CABE0A1C3506F100005705 /* Build configuration list for PBXNativeTarget "CGMBLEKitTests" */; buildPhases = ( 43CABDF91C3506F100005705 /* Sources */, 43CABDFA1C3506F100005705 /* Frameworks */, @@ -521,9 +521,9 @@ dependencies = ( 43CABE001C3506F100005705 /* PBXTargetDependency */, ); - name = xDripG5Tests; + name = CGMBLEKitTests; productName = xDripG5Tests; - productReference = 43CABDFD1C3506F100005705 /* xDripG5Tests.xctest */; + productReference = 43CABDFD1C3506F100005705 /* CGMBLEKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -564,7 +564,7 @@ }; }; }; - buildConfigurationList = 43CABDED1C3506F100005705 /* Build configuration list for PBXProject "xDripG5" */; + buildConfigurationList = 43CABDED1C3506F100005705 /* Build configuration list for PBXProject "CGMBLEKit" */; compatibilityVersion = "Xcode 8.0"; developmentRegion = English; hasScannedForEncodings = 0; @@ -577,8 +577,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 43CABDF21C3506F100005705 /* xDripG5 */, - 43CABDFC1C3506F100005705 /* xDripG5Tests */, + 43CABDF21C3506F100005705 /* CGMBLEKit */, + 43CABDFC1C3506F100005705 /* CGMBLEKitTests */, 437AFEF62038EC43008C4892 /* CGMBLEKit Example */, 4308103220785FEA00B66384 /* ResetTransmitter */, ); @@ -726,17 +726,17 @@ /* Begin PBXTargetDependency section */ 433F2E5F2079BB7D00808FA5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 43CABDF21C3506F100005705 /* xDripG5 */; + target = 43CABDF21C3506F100005705 /* CGMBLEKit */; targetProxy = 433F2E5E2079BB7D00808FA5 /* PBXContainerItemProxy */; }; 437AFF152038EDEC008C4892 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 43CABDF21C3506F100005705 /* xDripG5 */; + target = 43CABDF21C3506F100005705 /* CGMBLEKit */; targetProxy = 437AFF142038EDEC008C4892 /* PBXContainerItemProxy */; }; 43CABE001C3506F100005705 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 43CABDF21C3506F100005705 /* xDripG5 */; + target = 43CABDF21C3506F100005705 /* CGMBLEKit */; targetProxy = 43CABDFF1C3506F100005705 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1001,10 +1001,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 15; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = xDripG5/Info.plist; + INFOPLIST_FILE = CGMBLEKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.xDripG5; + PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.CGMBLEKit; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchos watchsimulator"; @@ -1023,10 +1023,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 15; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = xDripG5/Info.plist; + INFOPLIST_FILE = CGMBLEKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.xDripG5; + PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.CGMBLEKit; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchos watchsimulator"; @@ -1041,9 +1041,9 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = xDripG5Tests/Info.plist; + INFOPLIST_FILE = CGMBLEKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.xDripG5Tests; + PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.CGMBLEKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1055,9 +1055,9 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = xDripG5Tests/Info.plist; + INFOPLIST_FILE = CGMBLEKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.xDripG5Tests; + PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.CGMBLEKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -1083,7 +1083,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 43CABDED1C3506F100005705 /* Build configuration list for PBXProject "xDripG5" */ = { + 43CABDED1C3506F100005705 /* Build configuration list for PBXProject "CGMBLEKit" */ = { isa = XCConfigurationList; buildConfigurations = ( 43CABE051C3506F100005705 /* Debug */, @@ -1092,7 +1092,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 43CABE071C3506F100005705 /* Build configuration list for PBXNativeTarget "xDripG5" */ = { + 43CABE071C3506F100005705 /* Build configuration list for PBXNativeTarget "CGMBLEKit" */ = { isa = XCConfigurationList; buildConfigurations = ( 43CABE081C3506F100005705 /* Debug */, @@ -1101,7 +1101,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 43CABE0A1C3506F100005705 /* Build configuration list for PBXNativeTarget "xDripG5Tests" */ = { + 43CABE0A1C3506F100005705 /* Build configuration list for PBXNativeTarget "CGMBLEKitTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 43CABE0B1C3506F100005705 /* Debug */, diff --git a/xDripG5.xcodeproj/xcshareddata/xcschemes/xDripG5.xcscheme b/CGMBLEKit.xcodeproj/xcshareddata/xcschemes/CGMBLEKit.xcscheme similarity index 77% rename from xDripG5.xcodeproj/xcshareddata/xcschemes/xDripG5.xcscheme rename to CGMBLEKit.xcodeproj/xcshareddata/xcschemes/CGMBLEKit.xcscheme index 683bc3f0..66af089c 100644 --- a/xDripG5.xcodeproj/xcshareddata/xcschemes/xDripG5.xcscheme +++ b/CGMBLEKit.xcodeproj/xcshareddata/xcschemes/CGMBLEKit.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "CGMBLEKit.framework" + BlueprintName = "CGMBLEKit" + ReferencedContainer = "container:CGMBLEKit.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "CGMBLEKitTests.xctest" + BlueprintName = "CGMBLEKitTests" + ReferencedContainer = "container:CGMBLEKit.xcodeproj"> @@ -43,9 +43,9 @@ + BuildableName = "CGMBLEKit.framework" + BlueprintName = "CGMBLEKit" + ReferencedContainer = "container:CGMBLEKit.xcodeproj"> @@ -65,9 +65,9 @@ + BuildableName = "CGMBLEKit.framework" + BlueprintName = "CGMBLEKit" + ReferencedContainer = "container:CGMBLEKit.xcodeproj"> @@ -83,9 +83,9 @@ + BuildableName = "CGMBLEKit.framework" + BlueprintName = "CGMBLEKit" + ReferencedContainer = "container:CGMBLEKit.xcodeproj"> diff --git a/xDripG5/AESCrypt.h b/CGMBLEKit/AESCrypt.h similarity index 100% rename from xDripG5/AESCrypt.h rename to CGMBLEKit/AESCrypt.h diff --git a/xDripG5/AESCrypt.m b/CGMBLEKit/AESCrypt.m similarity index 100% rename from xDripG5/AESCrypt.m rename to CGMBLEKit/AESCrypt.m diff --git a/xDripG5/BluetoothManager.swift b/CGMBLEKit/BluetoothManager.swift similarity index 99% rename from xDripG5/BluetoothManager.swift rename to CGMBLEKit/BluetoothManager.swift index ca123708..f345264c 100644 --- a/xDripG5/BluetoothManager.swift +++ b/CGMBLEKit/BluetoothManager.swift @@ -88,12 +88,12 @@ class BluetoothManager: NSObject { // MARK: - GCD Management - private let managerQueue = DispatchQueue(label: "com.loudnate.xDripG5.bluetoothManagerQueue", qos: .utility) + private let managerQueue = DispatchQueue(label: "com.loudnate.CGMBLEKit.bluetoothManagerQueue", qos: .utility) override init() { super.init() - manager = CBCentralManager(delegate: self, queue: managerQueue, options: [CBCentralManagerOptionRestoreIdentifierKey: "com.loudnate.xDripG5"]) + manager = CBCentralManager(delegate: self, queue: managerQueue, options: [CBCentralManagerOptionRestoreIdentifierKey: "com.loudnate.CGMBLEKit"]) } // MARK: - Actions diff --git a/xDripG5/BluetoothServices.swift b/CGMBLEKit/BluetoothServices.swift similarity index 100% rename from xDripG5/BluetoothServices.swift rename to CGMBLEKit/BluetoothServices.swift diff --git a/xDripG5/CBPeripheral.swift b/CGMBLEKit/CBPeripheral.swift similarity index 100% rename from xDripG5/CBPeripheral.swift rename to CGMBLEKit/CBPeripheral.swift diff --git a/CGMBLEKit/CGMBLEKit.h b/CGMBLEKit/CGMBLEKit.h new file mode 100644 index 00000000..49882cc8 --- /dev/null +++ b/CGMBLEKit/CGMBLEKit.h @@ -0,0 +1,17 @@ +// +// CGMBLEKit.h +// xDripG5 +// +// Created by Nathan Racklyeft on 12/30/15. +// Copyright © 2015 Nathan Racklyeft. All rights reserved. +// + +#import +#import + +//! Project version number for CGMBLEKIt. +FOUNDATION_EXPORT double CGMBLEKitVersionNumber; + +//! Project version string for CGMBLEKit. +FOUNDATION_EXPORT const unsigned char CGMBLEKitVersionString[]; + diff --git a/xDripG5/Calibration.swift b/CGMBLEKit/Calibration.swift similarity index 100% rename from xDripG5/Calibration.swift rename to CGMBLEKit/Calibration.swift diff --git a/xDripG5/CalibrationState.swift b/CGMBLEKit/CalibrationState.swift similarity index 100% rename from xDripG5/CalibrationState.swift rename to CGMBLEKit/CalibrationState.swift diff --git a/xDripG5/Command.swift b/CGMBLEKit/Command.swift similarity index 100% rename from xDripG5/Command.swift rename to CGMBLEKit/Command.swift diff --git a/xDripG5/Glucose.swift b/CGMBLEKit/Glucose.swift similarity index 100% rename from xDripG5/Glucose.swift rename to CGMBLEKit/Glucose.swift diff --git a/xDripG5/Info.plist b/CGMBLEKit/Info.plist similarity index 100% rename from xDripG5/Info.plist rename to CGMBLEKit/Info.plist diff --git a/xDripG5/Messages/AuthChallengeRxMessage.swift b/CGMBLEKit/Messages/AuthChallengeRxMessage.swift similarity index 100% rename from xDripG5/Messages/AuthChallengeRxMessage.swift rename to CGMBLEKit/Messages/AuthChallengeRxMessage.swift diff --git a/xDripG5/Messages/AuthChallengeTxMessage.swift b/CGMBLEKit/Messages/AuthChallengeTxMessage.swift similarity index 100% rename from xDripG5/Messages/AuthChallengeTxMessage.swift rename to CGMBLEKit/Messages/AuthChallengeTxMessage.swift diff --git a/xDripG5/Messages/AuthRequestRxMessage.swift b/CGMBLEKit/Messages/AuthRequestRxMessage.swift similarity index 100% rename from xDripG5/Messages/AuthRequestRxMessage.swift rename to CGMBLEKit/Messages/AuthRequestRxMessage.swift diff --git a/xDripG5/Messages/AuthRequestTxMessage.swift b/CGMBLEKit/Messages/AuthRequestTxMessage.swift similarity index 100% rename from xDripG5/Messages/AuthRequestTxMessage.swift rename to CGMBLEKit/Messages/AuthRequestTxMessage.swift diff --git a/xDripG5/Messages/BatteryStatusTxMessage.swift b/CGMBLEKit/Messages/BatteryStatusTxMessage.swift similarity index 100% rename from xDripG5/Messages/BatteryStatusTxMessage.swift rename to CGMBLEKit/Messages/BatteryStatusTxMessage.swift diff --git a/xDripG5/Messages/BondRequestTxMessage.swift b/CGMBLEKit/Messages/BondRequestTxMessage.swift similarity index 100% rename from xDripG5/Messages/BondRequestTxMessage.swift rename to CGMBLEKit/Messages/BondRequestTxMessage.swift diff --git a/xDripG5/Messages/CalibrateGlucoseRxMessage.swift b/CGMBLEKit/Messages/CalibrateGlucoseRxMessage.swift similarity index 100% rename from xDripG5/Messages/CalibrateGlucoseRxMessage.swift rename to CGMBLEKit/Messages/CalibrateGlucoseRxMessage.swift diff --git a/xDripG5/Messages/CalibrateGlucoseTxMessage.swift b/CGMBLEKit/Messages/CalibrateGlucoseTxMessage.swift similarity index 100% rename from xDripG5/Messages/CalibrateGlucoseTxMessage.swift rename to CGMBLEKit/Messages/CalibrateGlucoseTxMessage.swift diff --git a/xDripG5/Messages/CalibrationDataRxMessage.swift b/CGMBLEKit/Messages/CalibrationDataRxMessage.swift similarity index 100% rename from xDripG5/Messages/CalibrationDataRxMessage.swift rename to CGMBLEKit/Messages/CalibrationDataRxMessage.swift diff --git a/xDripG5/Messages/CalibrationDataTxMessage.swift b/CGMBLEKit/Messages/CalibrationDataTxMessage.swift similarity index 100% rename from xDripG5/Messages/CalibrationDataTxMessage.swift rename to CGMBLEKit/Messages/CalibrationDataTxMessage.swift diff --git a/xDripG5/Messages/DisconnectTxMessage.swift b/CGMBLEKit/Messages/DisconnectTxMessage.swift similarity index 100% rename from xDripG5/Messages/DisconnectTxMessage.swift rename to CGMBLEKit/Messages/DisconnectTxMessage.swift diff --git a/xDripG5/Messages/FirmwareVersionTxMessage.swift b/CGMBLEKit/Messages/FirmwareVersionTxMessage.swift similarity index 100% rename from xDripG5/Messages/FirmwareVersionTxMessage.swift rename to CGMBLEKit/Messages/FirmwareVersionTxMessage.swift diff --git a/xDripG5/Messages/GlucoseBackfillMessage.swift b/CGMBLEKit/Messages/GlucoseBackfillMessage.swift similarity index 100% rename from xDripG5/Messages/GlucoseBackfillMessage.swift rename to CGMBLEKit/Messages/GlucoseBackfillMessage.swift diff --git a/xDripG5/Messages/GlucoseHistoryTxMessage.swift b/CGMBLEKit/Messages/GlucoseHistoryTxMessage.swift similarity index 100% rename from xDripG5/Messages/GlucoseHistoryTxMessage.swift rename to CGMBLEKit/Messages/GlucoseHistoryTxMessage.swift diff --git a/xDripG5/Messages/GlucoseRxMessage.swift b/CGMBLEKit/Messages/GlucoseRxMessage.swift similarity index 100% rename from xDripG5/Messages/GlucoseRxMessage.swift rename to CGMBLEKit/Messages/GlucoseRxMessage.swift diff --git a/xDripG5/Messages/GlucoseTxMessage.swift b/CGMBLEKit/Messages/GlucoseTxMessage.swift similarity index 100% rename from xDripG5/Messages/GlucoseTxMessage.swift rename to CGMBLEKit/Messages/GlucoseTxMessage.swift diff --git a/xDripG5/Messages/KeepAliveTxMessage.swift b/CGMBLEKit/Messages/KeepAliveTxMessage.swift similarity index 100% rename from xDripG5/Messages/KeepAliveTxMessage.swift rename to CGMBLEKit/Messages/KeepAliveTxMessage.swift diff --git a/xDripG5/Messages/ResetMessage.swift b/CGMBLEKit/Messages/ResetMessage.swift similarity index 100% rename from xDripG5/Messages/ResetMessage.swift rename to CGMBLEKit/Messages/ResetMessage.swift diff --git a/xDripG5/Messages/SessionStartRxMessage.swift b/CGMBLEKit/Messages/SessionStartRxMessage.swift similarity index 100% rename from xDripG5/Messages/SessionStartRxMessage.swift rename to CGMBLEKit/Messages/SessionStartRxMessage.swift diff --git a/xDripG5/Messages/SessionStartTxMessage.swift b/CGMBLEKit/Messages/SessionStartTxMessage.swift similarity index 100% rename from xDripG5/Messages/SessionStartTxMessage.swift rename to CGMBLEKit/Messages/SessionStartTxMessage.swift diff --git a/xDripG5/Messages/SessionStopRxMessage.swift b/CGMBLEKit/Messages/SessionStopRxMessage.swift similarity index 100% rename from xDripG5/Messages/SessionStopRxMessage.swift rename to CGMBLEKit/Messages/SessionStopRxMessage.swift diff --git a/xDripG5/Messages/SessionStopTxMessage.swift b/CGMBLEKit/Messages/SessionStopTxMessage.swift similarity index 100% rename from xDripG5/Messages/SessionStopTxMessage.swift rename to CGMBLEKit/Messages/SessionStopTxMessage.swift diff --git a/xDripG5/Messages/TransmitterMessage.swift b/CGMBLEKit/Messages/TransmitterMessage.swift similarity index 100% rename from xDripG5/Messages/TransmitterMessage.swift rename to CGMBLEKit/Messages/TransmitterMessage.swift diff --git a/xDripG5/Messages/TransmitterTimeRxMessage.swift b/CGMBLEKit/Messages/TransmitterTimeRxMessage.swift similarity index 100% rename from xDripG5/Messages/TransmitterTimeRxMessage.swift rename to CGMBLEKit/Messages/TransmitterTimeRxMessage.swift diff --git a/xDripG5/Messages/TransmitterTimeTxMessage.swift b/CGMBLEKit/Messages/TransmitterTimeTxMessage.swift similarity index 100% rename from xDripG5/Messages/TransmitterTimeTxMessage.swift rename to CGMBLEKit/Messages/TransmitterTimeTxMessage.swift diff --git a/xDripG5/Messages/TransmitterVersionRxMessage.swift b/CGMBLEKit/Messages/TransmitterVersionRxMessage.swift similarity index 100% rename from xDripG5/Messages/TransmitterVersionRxMessage.swift rename to CGMBLEKit/Messages/TransmitterVersionRxMessage.swift diff --git a/xDripG5/Messages/TransmitterVersionTxMessage.swift b/CGMBLEKit/Messages/TransmitterVersionTxMessage.swift similarity index 100% rename from xDripG5/Messages/TransmitterVersionTxMessage.swift rename to CGMBLEKit/Messages/TransmitterVersionTxMessage.swift diff --git a/xDripG5/NSData+CRC.swift b/CGMBLEKit/NSData+CRC.swift similarity index 100% rename from xDripG5/NSData+CRC.swift rename to CGMBLEKit/NSData+CRC.swift diff --git a/xDripG5/OSLog.swift b/CGMBLEKit/OSLog.swift similarity index 93% rename from xDripG5/OSLog.swift rename to CGMBLEKit/OSLog.swift index a6dd4af9..77bdef02 100644 --- a/xDripG5/OSLog.swift +++ b/CGMBLEKit/OSLog.swift @@ -10,7 +10,7 @@ import os.log extension OSLog { convenience init(category: String) { - self.init(subsystem: "com.loopkit.xDripG5", category: category) + self.init(subsystem: "com.loopkit.CGMBLEKit", category: category) } func debug(_ message: StaticString, _ args: CVarArg...) { diff --git a/xDripG5/Opcode.swift b/CGMBLEKit/Opcode.swift similarity index 98% rename from xDripG5/Opcode.swift rename to CGMBLEKit/Opcode.swift index dc90e432..a9419c31 100644 --- a/xDripG5/Opcode.swift +++ b/CGMBLEKit/Opcode.swift @@ -5,6 +5,7 @@ // Copyright © 2018 LoopKit Authors. All rights reserved. // +import Foundation enum Opcode: UInt8 { // Auth diff --git a/xDripG5/PeripheralManager+G5.swift b/CGMBLEKit/PeripheralManager+G5.swift similarity index 100% rename from xDripG5/PeripheralManager+G5.swift rename to CGMBLEKit/PeripheralManager+G5.swift diff --git a/xDripG5/PeripheralManager.swift b/CGMBLEKit/PeripheralManager.swift similarity index 100% rename from xDripG5/PeripheralManager.swift rename to CGMBLEKit/PeripheralManager.swift diff --git a/xDripG5/PeripheralManagerError.swift b/CGMBLEKit/PeripheralManagerError.swift similarity index 100% rename from xDripG5/PeripheralManagerError.swift rename to CGMBLEKit/PeripheralManagerError.swift diff --git a/xDripG5/Transmitter.swift b/CGMBLEKit/Transmitter.swift similarity index 99% rename from xDripG5/Transmitter.swift rename to CGMBLEKit/Transmitter.swift index 6a5b7d62..a5f84019 100644 --- a/xDripG5/Transmitter.swift +++ b/CGMBLEKit/Transmitter.swift @@ -88,7 +88,7 @@ public final class Transmitter: BluetoothManagerDelegate { private let bluetoothManager = BluetoothManager() - private let delegateQueue = DispatchQueue(label: "com.loudnate.xDripG5.delegateQueue", qos: .utility) + private let delegateQueue = DispatchQueue(label: "com.loudnate.CGMBLEKit.delegateQueue", qos: .utility) public init(id: String, passiveModeEnabled: Bool = false) { self.id = TransmitterID(id: id) diff --git a/xDripG5/TransmitterStatus.swift b/CGMBLEKit/TransmitterStatus.swift similarity index 100% rename from xDripG5/TransmitterStatus.swift rename to CGMBLEKit/TransmitterStatus.swift diff --git a/xDripG5Tests/CalibrationDataRxMessageTests.swift b/CGMBLEKitTests/CalibrationDataRxMessageTests.swift similarity index 52% rename from xDripG5Tests/CalibrationDataRxMessageTests.swift rename to CGMBLEKitTests/CalibrationDataRxMessageTests.swift index 5125bd7b..bae53c13 100644 --- a/xDripG5Tests/CalibrationDataRxMessageTests.swift +++ b/CGMBLEKitTests/CalibrationDataRxMessageTests.swift @@ -7,21 +7,11 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit class CalibrationDataRxMessageTests: XCTestCase { - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - func testMessage() { let data = Data(hexadecimalString: "33002b290090012900ae00800050e929001225")! XCTAssertNotNil(CalibrationDataRxMessage(data: data)) diff --git a/xDripG5Tests/GlucoseBackfillMessageTests.swift b/CGMBLEKitTests/GlucoseBackfillMessageTests.swift similarity index 99% rename from xDripG5Tests/GlucoseBackfillMessageTests.swift rename to CGMBLEKitTests/GlucoseBackfillMessageTests.swift index 4eb2ae71..7bead0cc 100644 --- a/xDripG5Tests/GlucoseBackfillMessageTests.swift +++ b/CGMBLEKitTests/GlucoseBackfillMessageTests.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit class GlucoseBackfillMessageTests: XCTestCase { diff --git a/xDripG5Tests/GlucoseRxMessageTests.swift b/CGMBLEKitTests/GlucoseRxMessageTests.swift similarity index 99% rename from xDripG5Tests/GlucoseRxMessageTests.swift rename to CGMBLEKitTests/GlucoseRxMessageTests.swift index 9c11d6c0..a966dba6 100644 --- a/xDripG5Tests/GlucoseRxMessageTests.swift +++ b/CGMBLEKitTests/GlucoseRxMessageTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit class GlucoseRxMessageTests: XCTestCase { diff --git a/xDripG5Tests/GlucoseTests.swift b/CGMBLEKitTests/GlucoseTests.swift similarity index 99% rename from xDripG5Tests/GlucoseTests.swift rename to CGMBLEKitTests/GlucoseTests.swift index 9756c220..119136a6 100644 --- a/xDripG5Tests/GlucoseTests.swift +++ b/CGMBLEKitTests/GlucoseTests.swift @@ -8,7 +8,7 @@ import XCTest import HealthKit -@testable import xDripG5 +@testable import CGMBLEKit class GlucoseTests: XCTestCase { diff --git a/xDripG5Tests/Info.plist b/CGMBLEKitTests/Info.plist similarity index 100% rename from xDripG5Tests/Info.plist rename to CGMBLEKitTests/Info.plist diff --git a/xDripG5Tests/SessionStartRxMessageTests.swift b/CGMBLEKitTests/SessionStartRxMessageTests.swift similarity index 98% rename from xDripG5Tests/SessionStartRxMessageTests.swift rename to CGMBLEKitTests/SessionStartRxMessageTests.swift index d406289d..f261a996 100644 --- a/xDripG5Tests/SessionStartRxMessageTests.swift +++ b/CGMBLEKitTests/SessionStartRxMessageTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit /// Thanks to https://github.com/mthatcher for the fixtures! class SessionStartRxMessageTests: XCTestCase { diff --git a/xDripG5Tests/SessionStopRxMessageTests.swift b/CGMBLEKitTests/SessionStopRxMessageTests.swift similarity index 98% rename from xDripG5Tests/SessionStopRxMessageTests.swift rename to CGMBLEKitTests/SessionStopRxMessageTests.swift index ceec54f4..3812e2f4 100644 --- a/xDripG5Tests/SessionStopRxMessageTests.swift +++ b/CGMBLEKitTests/SessionStopRxMessageTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit /// Thanks to https://github.com/mthatcher for the fixtures! class SessionStopRxMessageTests: XCTestCase { diff --git a/xDripG5Tests/TransmitterIDTests.swift b/CGMBLEKitTests/TransmitterIDTests.swift similarity index 94% rename from xDripG5Tests/TransmitterIDTests.swift rename to CGMBLEKitTests/TransmitterIDTests.swift index d8bedc36..7fffe4bf 100644 --- a/xDripG5Tests/TransmitterIDTests.swift +++ b/CGMBLEKitTests/TransmitterIDTests.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit class TransmitterIDTests: XCTestCase { diff --git a/xDripG5Tests/TransmitterTimeRxMessageTests.swift b/CGMBLEKitTests/TransmitterTimeRxMessageTests.swift similarity index 98% rename from xDripG5Tests/TransmitterTimeRxMessageTests.swift rename to CGMBLEKitTests/TransmitterTimeRxMessageTests.swift index cddeb188..1106ceea 100644 --- a/xDripG5Tests/TransmitterTimeRxMessageTests.swift +++ b/CGMBLEKitTests/TransmitterTimeRxMessageTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit /// Thanks to https://github.com/mthatcher for the fixtures! class TransmitterTimeRxMessageTests: XCTestCase { diff --git a/xDripG5Tests/TransmitterVersionRxMessageTests.swift b/CGMBLEKitTests/TransmitterVersionRxMessageTests.swift similarity index 95% rename from xDripG5Tests/TransmitterVersionRxMessageTests.swift rename to CGMBLEKitTests/TransmitterVersionRxMessageTests.swift index d4f40f72..d7ab0849 100644 --- a/xDripG5Tests/TransmitterVersionRxMessageTests.swift +++ b/CGMBLEKitTests/TransmitterVersionRxMessageTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import xDripG5 +@testable import CGMBLEKit class TransmitterVersionRxMessageTests: XCTestCase { diff --git a/Pod/xDripG5.h b/Pod/CGMBLEKit.h similarity index 73% rename from Pod/xDripG5.h rename to Pod/CGMBLEKit.h index 63dab445..a2884035 100644 --- a/Pod/xDripG5.h +++ b/Pod/CGMBLEKit.h @@ -1,5 +1,5 @@ // -// xDripG5.h +// CGMBLEKit.h // xDripG5 // // Created by Nathan Racklyeft on 12/31/15. @@ -7,4 +7,4 @@ // -#import \ No newline at end of file +#import \ No newline at end of file diff --git a/README.md b/README.md index f2f4415d..32e084e0 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,9 @@ -# xDripG5 +# CGMBLEKit [![CI Status](http://img.shields.io/travis/LoopKit/xDripG5.svg?style=flat)](https://travis-ci.org/LoopKit/xDripG5) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) -[![Version](https://img.shields.io/cocoapods/v/xDripG5.svg?style=flat)](http://cocoapods.org/pods/xDripG5) -[![License](https://img.shields.io/cocoapods/l/xDripG5.svg?style=flat)](http://cocoapods.org/pods/xDripG5) -[![Platform](https://img.shields.io/cocoapods/p/xDripG5.svg?style=flat)](http://cocoapods.org/pods/xDripG5) -A iOS framework providing an interface for communicating with the G5 glucose transmitter over Bluetooth. The name and inspiration comes from [xDrip](http://stephenblackwasalreadytaken.github.io/xDrip/), a breakthrough application for connecting to the G4 system. +A iOS framework providing an interface for communicating with the G5 glucose transmitter over Bluetooth. *Please note this project is neither created nor backed by Dexcom, Inc. This software is not intended for use in therapy.* @@ -18,13 +15,13 @@ This framework connects to a G5 Mobile Transmitter via Bluetooth LE. It does not ### Carthage -xDripG5 is available through [Carthage](https://github.com/Carthage/Carthage). To install it, add the following line to your Cartfile: +CGMBLEKit is available through [Carthage](https://github.com/Carthage/Carthage). To install it, add the following line to your Cartfile: ```ruby github "LoopKit/xDripG5" ``` -Note that you'll need to confgure your target to link against `CommonCrypto.framework` in addition to `xDripG5.framework` +Note that you'll need to confgure your target to link against `CommonCrypto.framework` in addition to `CGMBLEKit.framework` ## Usage @@ -36,11 +33,11 @@ If you plan to run your app alongside the G5 Mobile application, make sure to se ## ResetTransmitter App Installation -Download the XdripG5 code by clicking on the green `Clone or Download` button (scroll up on this page and you'll find it), then select `Download Zip` +Download the CGMBLEKit code by clicking on the green `Clone or Download` button (scroll up on this page and you'll find it), then select `Download Zip` ![ResetTransmitter help](https://github.com/Kdisimone/images/blob/master/resetTransmitter-first.png) -Then navigate to the `XdripG5-dev` folder that just downloaded to your computer. Double-click on the `xDripG5.xcodeproj` file to open the project in Xcode. +Then navigate to the `XdripG5-dev` folder that just downloaded to your computer. Double-click on the `CGMBLEKit.xcodeproj` file to open the project in Xcode. ![ResetTransmitter help](https://github.com/Kdisimone/images/blob/master/resetTransmitter-download.png) @@ -55,4 +52,4 @@ Please note that this project is released with a [Contributor Code of Conduct](h ## License -xDripG5 is available under the MIT license. See the LICENSE file for more info. +CGMBLEKit is available under the MIT license. See the LICENSE file for more info. diff --git a/ResetTransmitter/ResetManager.swift b/ResetTransmitter/ResetManager.swift index 09c88083..d12d74f8 100644 --- a/ResetTransmitter/ResetManager.swift +++ b/ResetTransmitter/ResetManager.swift @@ -5,7 +5,7 @@ // Copyright © 2018 LoopKit Authors. All rights reserved. // -import xDripG5 +import CGMBLEKit import os.log diff --git a/xDripG5.podspec b/xDripG5.podspec index 8374f388..9e4201a1 100644 --- a/xDripG5.podspec +++ b/xDripG5.podspec @@ -11,16 +11,16 @@ By using this framework in your own app, you can get access to your glucose read Please note this project is neither created nor backed by Dexcom, Inc. Use of this software is not intended for therapy. DESC - s.homepage = "https://github.com/LoopKit/xDripG5" + s.homepage = "https://github.com/LoopKit/CGMBLEKit" s.license = 'MIT' s.author = { "Nathan Racklyeft" => "loudnate@gmail.com" } - s.source = { :git => "https://github.com/LoopKit/xDripG5.git", :tag => s.version.to_s } + s.source = { :git => "https://github.com/LoopKit/CGMBLEKit.git", :tag => s.version.to_s } s.platform = :ios, '9.3' s.requires_arc = true - s.source_files = ['xDripG5/**/*.swift', 'xDripG5/AESCrypt.{h,m}', 'Pod/*.h'] - s.public_header_files = ['Pod/*.h', 'xDripG5/AESCrypt.h'] + s.source_files = ['CGMBLEKit/**/*.swift', 'CGMBLEKit/AESCrypt.{h,m}', 'Pod/*.h'] + s.public_header_files = ['Pod/*.h', 'CGMBLEKit/AESCrypt.h'] s.frameworks = 'CoreBluetooth' end diff --git a/xDripG5.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/xDripG5.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 11256294..00000000 --- a/xDripG5.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/xDripG5/xDripG5.h b/xDripG5/xDripG5.h deleted file mode 100644 index 3b949160..00000000 --- a/xDripG5/xDripG5.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// xDripG5.h -// xDripG5 -// -// 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[]; -