Skip to content

Commit a1e5e91

Browse files
ps2ps2
authored
Merge pull request #1390 from LoopKit/dev
Release 2.2.3
2 parents ffb08ef + 4f7139a commit a1e5e91

File tree

17 files changed

+61
-77
lines changed

17 files changed

+61
-77
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode12
2+
osx_image: xcode11
33
# xcode_sdk: iphonesimulator11
44
# xcode_project: Loop.xcodeproj
55
# xcode_scheme: Loop

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ github "LoopKit/CGMBLEKit" "7b4c1022eb6b91ae3975bfc8ce93fde8e496b4f3"
33
github "LoopKit/G4ShareSpy" "3b749bc7f6323ad8303af6c755ba9b5649eff816"
44
github "LoopKit/LoopKit" "953b58e617379354b89ea33e0fd8f220ccc2d366"
55
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
6-
github "LoopKit/dexcom-share-client-swift" "146cccfe4eba5f536487777a72e0e47834fff64e"
6+
github "LoopKit/dexcom-share-client-swift" "68ea5d08588e00bf148518b126416b8352dbef64"
77
github "i-schuetz/SwiftCharts" "0.6.5"
8-
github "ps2/rileylink_ios" "802cc005e3eb10cb5e407586210ceb62a57f8c22"
8+
github "ps2/rileylink_ios" "cd9be51111c9ce40d86c0fe4f57660055995c922"

‎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>2.2.2</string>
18+
<string>2.2.3</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Learn/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.2.2</string>
22+
<string>2.2.3</string>
2323
<key>CFBundleVersion</key>
2424
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>LSRequiresIPhoneOS</key>

‎Loop Status Extension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>XPC!</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.2.2</string>
22+
<string>2.2.3</string>
2323
<key>CFBundleVersion</key>
2424
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>MainAppBundleIdentifier</key>

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2417,7 +2417,7 @@
24172417
);
24182418
runOnlyForDeploymentPostprocessing = 0;
24192419
shellPath = /bin/sh;
2420-
shellScript = "\n\nif [ -f $PROJECT_DIR/.gitmodules ]; then\n echo \"Skipping checkout due to presence of .gitmodules file\"\n if [ $ACTION = \"install\" ]; then\n echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n fi\nelse\n echo \"Bootstrapping carthage dependencies\"\n\n xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)\n trap 'rm -f \"$xcconfig\"' INT TERM HUP EXIT\n\n# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise\n# the build will fail on lipo due to duplicate architectures.\n# Xcode 12 Beta 3:\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8169g = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 4\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8179i = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 5\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189h = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 6\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189n = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 GM\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7208 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 GM 2\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7209 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig\necho 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig\necho 'ONLY_ACTIVE_ARCH=NO' >> $xcconfig\necho 'VALID_ARCHS = $(inherited) x86_64' >> $xcconfig\nexport XCODE_XCCONFIG_FILE=\"$xcconfig\"\necho $XCODE_XCCONFIG_FILE\n cat $XCODE_XCCONFIG_FILE\n unset LLVM_TARGET_TRIPLE_SUFFIX\n /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
2420+
shellScript = "\n\nif [ -f $PROJECT_DIR/.gitmodules ]; then\n echo \"Skipping checkout due to presence of .gitmodules file\"\n if [ $ACTION = \"install\" ]; then\n echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n fi\nelse\n echo \"Bootstrapping carthage dependencies\"\n\n xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)\n trap 'rm -f \"$xcconfig\"' INT TERM HUP EXIT\n\n# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise\n# the build will fail on lipo due to duplicate architectures.\n# Xcode 12 Beta 3:\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8169g = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 4\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8179i = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 5\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189h = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 6\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189n = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 GM\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7208 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 GM 2\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7209 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12.0.1\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7300 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig\necho 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig\necho 'ONLY_ACTIVE_ARCH=NO' >> $xcconfig\necho 'VALID_ARCHS = $(inherited) x86_64' >> $xcconfig\nexport XCODE_XCCONFIG_FILE=\"$xcconfig\"\necho $XCODE_XCCONFIG_FILE\n cat $XCODE_XCCONFIG_FILE\n unset LLVM_TARGET_TRIPLE_SUFFIX\n /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
24212421
};
24222422
432CF88220D8BCD90066B889 /* Homebrew & Carthage Setup */ = {
24232423
isa = PBXShellScriptBuildPhase;
@@ -3816,7 +3816,9 @@
38163816
PRODUCT_BUNDLE_IDENTIFIER = com.loopkit.LoopCore;
38173817
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
38183818
SKIP_INSTALL = YES;
3819+
SUPPORTS_MACCATALYST = NO;
38193820
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
3821+
TARGETED_DEVICE_FAMILY = "1,2";
38203822
VERSIONING_SYSTEM = "apple-generic";
38213823
VERSION_INFO_PREFIX = "";
38223824
};
@@ -3848,6 +3850,8 @@
38483850
PRODUCT_BUNDLE_IDENTIFIER = com.loopkit.LoopCore;
38493851
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
38503852
SKIP_INSTALL = YES;
3853+
SUPPORTS_MACCATALYST = NO;
3854+
TARGETED_DEVICE_FAMILY = "1,2";
38513855
VERSIONING_SYSTEM = "apple-generic";
38523856
VERSION_INFO_PREFIX = "";
38533857
};
@@ -3985,7 +3989,9 @@
39853989
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).LoopUI";
39863990
PRODUCT_NAME = "$(TARGET_NAME)";
39873991
SKIP_INSTALL = YES;
3992+
SUPPORTS_MACCATALYST = NO;
39883993
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
3994+
TARGETED_DEVICE_FAMILY = "1,2";
39893995
VERSIONING_SYSTEM = "apple-generic";
39903996
VERSION_INFO_PREFIX = "";
39913997
};
@@ -4012,6 +4018,8 @@
40124018
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).LoopUI";
40134019
PRODUCT_NAME = "$(TARGET_NAME)";
40144020
SKIP_INSTALL = YES;
4021+
SUPPORTS_MACCATALYST = NO;
4022+
TARGETED_DEVICE_FAMILY = "1,2";
40154023
VERSIONING_SYSTEM = "apple-generic";
40164024
VERSION_INFO_PREFIX = "";
40174025
};

‎Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,16 @@
8888
debugServiceExtension = "internal"
8989
allowLocationSimulation = "YES"
9090
launchAutomaticallySubstyle = "32">
91-
<RemoteRunnable
92-
runnableDebuggingMode = "2"
93-
BundleIdentifier = "com.apple.Carousel"
94-
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
91+
<BuildableProductRunnable
92+
runnableDebuggingMode = "0">
9593
<BuildableReference
9694
BuildableIdentifier = "primary"
9795
BlueprintIdentifier = "43A943711B926B7B0051FA24"
9896
BuildableName = "WatchApp.app"
9997
BlueprintName = "WatchApp"
10098
ReferencedContainer = "container:Loop.xcodeproj">
10199
</BuildableReference>
102-
</RemoteRunnable>
100+
</BuildableProductRunnable>
103101
</LaunchAction>
104102
<ProfileAction
105103
buildConfiguration = "Release"
@@ -108,27 +106,16 @@
108106
useCustomWorkingDirectory = "NO"
109107
debugDocumentVersioning = "YES"
110108
launchAutomaticallySubstyle = "32">
111-
<RemoteRunnable
112-
runnableDebuggingMode = "2"
113-
BundleIdentifier = "com.apple.Carousel"
114-
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
109+
<BuildableProductRunnable
110+
runnableDebuggingMode = "0">
115111
<BuildableReference
116112
BuildableIdentifier = "primary"
117113
BlueprintIdentifier = "43A943711B926B7B0051FA24"
118114
BuildableName = "WatchApp.app"
119115
BlueprintName = "WatchApp"
120116
ReferencedContainer = "container:Loop.xcodeproj">
121117
</BuildableReference>
122-
</RemoteRunnable>
123-
<MacroExpansion>
124-
<BuildableReference
125-
BuildableIdentifier = "primary"
126-
BlueprintIdentifier = "43A943711B926B7B0051FA24"
127-
BuildableName = "WatchApp.app"
128-
BlueprintName = "WatchApp"
129-
ReferencedContainer = "container:Loop.xcodeproj">
130-
</BuildableReference>
131-
</MacroExpansion>
118+
</BuildableProductRunnable>
132119
</ProfileAction>
133120
<AnalyzeAction
134121
buildConfiguration = "Debug">

‎Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,16 @@
8989
allowLocationSimulation = "YES"
9090
launchAutomaticallySubstyle = "8"
9191
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
92-
<RemoteRunnable
93-
runnableDebuggingMode = "2"
94-
BundleIdentifier = "com.apple.Carousel"
95-
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
92+
<BuildableProductRunnable
93+
runnableDebuggingMode = "0">
9694
<BuildableReference
9795
BuildableIdentifier = "primary"
9896
BlueprintIdentifier = "43A943711B926B7B0051FA24"
9997
BuildableName = "WatchApp.app"
10098
BlueprintName = "WatchApp"
10199
ReferencedContainer = "container:Loop.xcodeproj">
102100
</BuildableReference>
103-
</RemoteRunnable>
101+
</BuildableProductRunnable>
104102
</LaunchAction>
105103
<ProfileAction
106104
buildConfiguration = "Release"
@@ -110,27 +108,16 @@
110108
debugDocumentVersioning = "YES"
111109
launchAutomaticallySubstyle = "8"
112110
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
113-
<RemoteRunnable
114-
runnableDebuggingMode = "2"
115-
BundleIdentifier = "com.apple.Carousel"
116-
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
111+
<BuildableProductRunnable
112+
runnableDebuggingMode = "0">
117113
<BuildableReference
118114
BuildableIdentifier = "primary"
119115
BlueprintIdentifier = "43A943711B926B7B0051FA24"
120116
BuildableName = "WatchApp.app"
121117
BlueprintName = "WatchApp"
122118
ReferencedContainer = "container:Loop.xcodeproj">
123119
</BuildableReference>
124-
</RemoteRunnable>
125-
<MacroExpansion>
126-
<BuildableReference
127-
BuildableIdentifier = "primary"
128-
BlueprintIdentifier = "43A943711B926B7B0051FA24"
129-
BuildableName = "WatchApp.app"
130-
BlueprintName = "WatchApp"
131-
ReferencedContainer = "container:Loop.xcodeproj">
132-
</BuildableReference>
133-
</MacroExpansion>
120+
</BuildableProductRunnable>
134121
</ProfileAction>
135122
<AnalyzeAction
136123
buildConfiguration = "Debug">

‎Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,16 @@
8888
debugServiceExtension = "internal"
8989
allowLocationSimulation = "YES"
9090
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
91-
<RemoteRunnable
92-
runnableDebuggingMode = "2"
93-
BundleIdentifier = "com.apple.Carousel"
94-
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
91+
<BuildableProductRunnable
92+
runnableDebuggingMode = "0">
9593
<BuildableReference
9694
BuildableIdentifier = "primary"
9795
BlueprintIdentifier = "43A943711B926B7B0051FA24"
9896
BuildableName = "WatchApp.app"
9997
BlueprintName = "WatchApp"
10098
ReferencedContainer = "container:Loop.xcodeproj">
10199
</BuildableReference>
102-
</RemoteRunnable>
100+
</BuildableProductRunnable>
103101
</LaunchAction>
104102
<ProfileAction
105103
buildConfiguration = "Release"
@@ -108,27 +106,16 @@
108106
useCustomWorkingDirectory = "NO"
109107
debugDocumentVersioning = "YES"
110108
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
111-
<RemoteRunnable
112-
runnableDebuggingMode = "2"
113-
BundleIdentifier = "com.apple.Carousel"
114-
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
109+
<BuildableProductRunnable
110+
runnableDebuggingMode = "0">
115111
<BuildableReference
116112
BuildableIdentifier = "primary"
117113
BlueprintIdentifier = "43A943711B926B7B0051FA24"
118114
BuildableName = "WatchApp.app"
119115
BlueprintName = "WatchApp"
120116
ReferencedContainer = "container:Loop.xcodeproj">
121117
</BuildableReference>
122-
</RemoteRunnable>
123-
<MacroExpansion>
124-
<BuildableReference
125-
BuildableIdentifier = "primary"
126-
BlueprintIdentifier = "43A943711B926B7B0051FA24"
127-
BuildableName = "WatchApp.app"
128-
BlueprintName = "WatchApp"
129-
ReferencedContainer = "container:Loop.xcodeproj">
130-
</BuildableReference>
131-
</MacroExpansion>
118+
</BuildableProductRunnable>
132119
</ProfileAction>
133120
<AnalyzeAction
134121
buildConfiguration = "Debug">

‎Loop/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.2.2</string>
22+
<string>2.2.3</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>

0 commit comments

Comments
 (0)