Skip to content

Commit 8d8d541

Browse files
authored
Merge pull request #83 from loudnate/dev
Version 0.7.1
2 parents c21b788 + dd016ac commit 8d8d541

File tree

41 files changed

+22
-44
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+22
-44
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@ fastlane/report.xml
6565
fastlane/screenshots
6666

6767
# Sensitive details about remote backup
68-
RemoteSettings.plist
68+
RemoteSettings.plist
69+
70+
# OS
71+
.DS_Store
72+

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ github "loudnate/LoopKit" ~> 0.3.5
22
github "loudnate/xDripG5" ~> 0.5.0
33
github "loudnate/SwiftCharts" "loudnate/naterade"
44
github "mddub/dexcom-share-client-swift" ~> 0.1
5-
github "ps2/rileylink_ios" ~> 0.7.0
5+
github "ps2/rileylink_ios" ~> 0.7.1
66
github "amplitude/Amplitude-iOS" "mpurland-framework"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ github "loudnate/LoopKit" "v0.3.5"
44
github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
55
github "mddub/dexcom-share-client-swift" "v0.1.3"
66
github "loudnate/xDripG5" "0.5.0"
7-
github "ps2/rileylink_ios" "v0.7.0"
7+
github "ps2/rileylink_ios" "v0.7.1"
Binary file not shown.
-20 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
264 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-61.9 KB

DoseMathTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Loop.xcodeproj/project.pbxproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
43F78D4E1C914197002152D1 /* InsulinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4A1C914197002152D1 /* InsulinKit.framework */; };
134134
43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; };
135135
C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
136-
C51F56121D3B91CD004C46ED /* PumpModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C51F56111D3B91CD004C46ED /* PumpModel.swift */; };
137136
/* End PBXBuildFile section */
138137

139138
/* Begin PBXContainerItemProxy section */
@@ -347,7 +346,6 @@
347346
43F78D4A1C914197002152D1 /* InsulinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InsulinKit.framework; path = Carthage/Build/iOS/InsulinKit.framework; sourceTree = "<group>"; };
348347
43F78D4B1C914197002152D1 /* LoopKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKit.framework; path = Carthage/Build/iOS/LoopKit.framework; sourceTree = "<group>"; };
349348
C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NightscoutUploadKit.framework; path = Carthage/Build/iOS/NightscoutUploadKit.framework; sourceTree = "<group>"; };
350-
C51F56111D3B91CD004C46ED /* PumpModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PumpModel.swift; sourceTree = "<group>"; };
351349
/* End PBXFileReference section */
352350

353351
/* Begin PBXFrameworksBuildPhase section */
@@ -579,7 +577,6 @@
579577
4398973A1CD2FC2000223065 /* NSDateFormatter.swift */,
580578
439897341CD2F7DE00223065 /* NSTimeInterval.swift */,
581579
43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */,
582-
C51F56111D3B91CD004C46ED /* PumpModel.swift */,
583580
43F41C361D3BF32400C11ED6 /* UIAlertController.swift */,
584581
43DE92501C541832001FFDE1 /* UIColor.swift */,
585582
437CEEE31CDE5C0A003C8C80 /* UIImage.swift */,
@@ -945,7 +942,6 @@
945942
buildActionMask = 2147483647;
946943
files = (
947944
434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */,
948-
C51F56121D3B91CD004C46ED /* PumpModel.swift in Sources */,
949945
4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */,
950946
43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */,
951947
434F24C91CFCA8940004498F /* TransmitterGlucose.swift in Sources */,
@@ -1125,6 +1121,7 @@
11251121
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11261122
CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)";
11271123
COPY_PHASE_STRIP = NO;
1124+
CURRENT_PROJECT_VERSION = 13;
11281125
DEBUG_INFORMATION_FORMAT = dwarf;
11291126
ENABLE_STRICT_OBJC_MSGSEND = YES;
11301127
ENABLE_TESTABILITY = YES;
@@ -1172,6 +1169,7 @@
11721169
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11731170
CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)";
11741171
COPY_PHASE_STRIP = NO;
1172+
CURRENT_PROJECT_VERSION = 13;
11751173
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11761174
ENABLE_NS_ASSERTIONS = NO;
11771175
ENABLE_STRICT_OBJC_MSGSEND = YES;

Loop/Extensions/PumpModel.swift

Lines changed: 0 additions & 27 deletions
This file was deleted.

Loop/Info.plist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
66
<string>en</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>Loop</string>
79
<key>CFBundleExecutable</key>
810
<string>$(EXECUTABLE_NAME)</string>
911
<key>CFBundleIdentifier</key>
@@ -15,11 +17,11 @@
1517
<key>CFBundlePackageType</key>
1618
<string>APPL</string>
1719
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
20+
<string>0.7.1</string>
1921
<key>CFBundleSignature</key>
2022
<string>????</string>
2123
<key>CFBundleVersion</key>
22-
<string>12</string>
24+
<string>$(CURRENT_PROJECT_VERSION)</string>
2325
<key>LSApplicationQueriesSchemes</key>
2426
<array>
2527
<string>dexcomcgm</string>

Loop/View Controllers/SettingsTableViewController.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@ class SettingsTableViewController: UITableViewController, DailyValueScheduleTabl
294294
override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
295295
switch Section(rawValue: section)! {
296296
case .Loop:
297-
return nil
297+
let version = NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleShortVersionString")!
298+
return "Loop iOS v\(version)"
298299
case .Configuration:
299300
return NSLocalizedString("Configuration", comment: "The title of the configuration section in settings")
300301
case .Devices:

LoopTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

WatchApp Extension/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>XPC!</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.7.0</string>
20+
<string>0.7.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>1</string>
24+
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>CLKComplicationPrincipalClass</key>
2626
<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
2727
<key>CLKComplicationSupportedFamilies</key>

WatchApp/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.7.0</string>
20+
<string>0.7.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>12</string>
24+
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>UISupportedInterfaceOrientations</key>
2626
<array>
2727
<string>UIInterfaceOrientationPortrait</string>

0 commit comments

Comments
 (0)