Skip to content

Commit 407f23f

Browse files
ps2ps2
authored
Merge pull request #14 from tidepool-org/ps2/LOOP-1689/diy-sync
Sync from DIY
2 parents 4814070 + a62e017 commit 407f23f

File tree

32 files changed

+70
-25
lines changed

32 files changed

+70
-25
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode11.6
33

4+
before_script:
5+
- carthage bootstrap
46

57
script:
6-
# Build Travis project and run tests
7-
- xcodebuild -project ShareClient.xcodeproj -scheme ShareClient build -destination name="iPhone SE" test
8+
# Build Travis project and run tests
9+
- xcodebuild -project ShareClient.xcodeproj -scheme Shared build -destination name="iPhone 8" test

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "LoopKit/LoopKit" "dev"
1+
github "LoopKit/LoopKit" "merge-from-tidepool"

‎Cartfile.resolved‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
github "LoopKit/LoopKit" "7333408f054e269669c91146b0f29bffbdcc150a"
1+
github "LoopKit/LoopKit" "564d8554d43f65034d341e0edf0ffd5bec7223eb"
2+
github "i-schuetz/SwiftCharts" "0.6.5"

‎ShareClient.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,20 @@
120120
43AB51302133161A00B3D58D /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
121121
43AB51352133177800B3D58D /* LocalizedString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalizedString.swift; sourceTree = "<group>"; };
122122
43C418AE1CE0488900405B6A /* ShareClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareClient.swift; sourceTree = "<group>"; };
123+
7D9BF1232336FF88005DCFD6 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
124+
7D9BF1242336FF89005DCFD6 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
125+
7D9BF1252336FF8F005DCFD6 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
126+
7D9BF1262336FF8F005DCFD6 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
127+
7D9BF1272336FF96005DCFD6 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
128+
7D9BF1282336FF96005DCFD6 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
129+
7D9BF1292336FF9C005DCFD6 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
130+
7D9BF12A2336FF9C005DCFD6 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
131+
7D9BF12B2336FFA2005DCFD6 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Localizable.strings; sourceTree = "<group>"; };
132+
7D9BF12C2336FFA2005DCFD6 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Localizable.strings; sourceTree = "<group>"; };
133+
7D9BF12D2336FFA9005DCFD6 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
134+
7D9BF12E2336FFA9005DCFD6 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
135+
7D9BF12F2336FFAF005DCFD6 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
136+
7D9BF1302336FFAF005DCFD6 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
123137
A9ED4DA4225EB4D30080DEBA /* ShareClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ShareClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
124138
A9ED4DAE225EB9390080DEBA /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HealthKit.framework; sourceTree = DEVELOPER_DIR; };
125139
B40BF25E23ABD47400A43CEE /* ShareClientPlugin.loopplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ShareClientPlugin.loopplugin; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -403,20 +417,20 @@
403417
isa = PBXProject;
404418
attributes = {
405419
LastSwiftUpdateCheck = 0730;
406-
LastUpgradeCheck = 0940;
420+
LastUpgradeCheck = 1020;
407421
ORGANIZATIONNAME = "Mark Wilson";
408422
TargetAttributes = {
409423
432B0E871CDFC3C50045347B = {
410424
CreatedOnToolsVersion = 7.3.1;
411-
LastSwiftMigration = 1000;
425+
LastSwiftMigration = 1020;
412426
};
413427
432B0E911CDFC3C50045347B = {
414428
CreatedOnToolsVersion = 7.3.1;
415-
LastSwiftMigration = 0900;
429+
LastSwiftMigration = 1020;
416430
};
417431
43A8EC81210E664300A81379 = {
418432
CreatedOnToolsVersion = 9.4.1;
419-
LastSwiftMigration = 1000;
433+
LastSwiftMigration = 1020;
420434
ProvisioningStyle = Automatic;
421435
};
422436
B40BF25D23ABD47400A43CEE = {
@@ -428,7 +442,7 @@
428442
};
429443
buildConfigurationList = 432B0E821CDFC3C50045347B /* Build configuration list for PBXProject "ShareClient" */;
430444
compatibilityVersion = "Xcode 3.2";
431-
developmentRegion = English;
445+
developmentRegion = en;
432446
hasScannedForEncodings = 0;
433447
knownRegions = (
434448
English,
@@ -443,6 +457,13 @@
443457
nb,
444458
ru,
445459
pl,
460+
ja,
461+
"pt-BR",
462+
sv,
463+
vi,
464+
ro,
465+
fi,
466+
da,
446467
);
447468
mainGroup = 432B0E7E1CDFC3C50045347B;
448469
productRefGroup = 432B0E891CDFC3C50045347B /* Products */;
@@ -617,6 +638,13 @@
617638
43AB512221330D8A00B3D58D /* nb */,
618639
43AB512321330D8E00B3D58D /* ru */,
619640
43AB512421330D9400B3D58D /* pl */,
641+
7D9BF1242336FF89005DCFD6 /* ja */,
642+
7D9BF1262336FF8F005DCFD6 /* pt-BR */,
643+
7D9BF1282336FF96005DCFD6 /* sv */,
644+
7D9BF12A2336FF9C005DCFD6 /* vi */,
645+
7D9BF12C2336FFA2005DCFD6 /* ro */,
646+
7D9BF12E2336FFA9005DCFD6 /* fi */,
647+
7D9BF1302336FFAF005DCFD6 /* da */,
620648
);
621649
name = Localizable.strings;
622650
sourceTree = "<group>";
@@ -634,6 +662,13 @@
634662
43AB512E2133161900B3D58D /* nb */,
635663
43AB512F2133161A00B3D58D /* ru */,
636664
43AB51302133161A00B3D58D /* pl */,
665+
7D9BF1232336FF88005DCFD6 /* ja */,
666+
7D9BF1252336FF8F005DCFD6 /* pt-BR */,
667+
7D9BF1272336FF96005DCFD6 /* sv */,
668+
7D9BF1292336FF9C005DCFD6 /* vi */,
669+
7D9BF12B2336FFA2005DCFD6 /* ro */,
670+
7D9BF12D2336FFA9005DCFD6 /* fi */,
671+
7D9BF12F2336FFAF005DCFD6 /* da */,
637672
);
638673
name = Localizable.strings;
639674
sourceTree = "<group>";
@@ -700,6 +735,7 @@
700735
ONLY_ACTIVE_ARCH = YES;
701736
SDKROOT = iphoneos;
702737
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
738+
SWIFT_VERSION = 5.0;
703739
TARGETED_DEVICE_FAMILY = "1,2";
704740
VERSIONING_SYSTEM = "apple-generic";
705741
VERSION_INFO_PREFIX = "";
@@ -759,6 +795,7 @@
759795
MTL_ENABLE_DEBUG_INFO = NO;
760796
SDKROOT = iphoneos;
761797
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
798+
SWIFT_VERSION = 5.0;
762799
TARGETED_DEVICE_FAMILY = "1,2";
763800
VALIDATE_PRODUCT = YES;
764801
VERSIONING_SYSTEM = "apple-generic";
@@ -788,7 +825,6 @@
788825
PRODUCT_NAME = "$(TARGET_NAME)";
789826
SKIP_INSTALL = YES;
790827
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
791-
SWIFT_VERSION = 4.2;
792828
};
793829
name = Debug;
794830
};
@@ -812,7 +848,6 @@
812848
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClient;
813849
PRODUCT_NAME = "$(TARGET_NAME)";
814850
SKIP_INSTALL = YES;
815-
SWIFT_VERSION = 4.2;
816851
};
817852
name = Release;
818853
};
@@ -827,7 +862,6 @@
827862
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
828863
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;
829864
PRODUCT_NAME = "$(TARGET_NAME)";
830-
SWIFT_VERSION = 4.0;
831865
};
832866
name = Debug;
833867
};
@@ -842,7 +876,6 @@
842876
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
843877
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;
844878
PRODUCT_NAME = "$(TARGET_NAME)";
845-
SWIFT_VERSION = 4.0;
846879
};
847880
name = Release;
848881
};
@@ -875,7 +908,6 @@
875908
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
876909
SKIP_INSTALL = YES;
877910
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
878-
SWIFT_VERSION = 4.2;
879911
TARGETED_DEVICE_FAMILY = "1,2";
880912
};
881913
name = Debug;
@@ -908,7 +940,6 @@
908940
PRODUCT_BUNDLE_IDENTIFIER = com.loopkit.ShareClientUI;
909941
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
910942
SKIP_INSTALL = YES;
911-
SWIFT_VERSION = 4.2;
912943
TARGETED_DEVICE_FAMILY = "1,2";
913944
};
914945
name = Release;
@@ -918,6 +949,7 @@
918949
buildSettings = {
919950
APPLICATION_EXTENSION_API_ONLY = YES;
920951
CLANG_ENABLE_MODULES = YES;
952+
CODE_SIGN_IDENTITY = "";
921953
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
922954
DEFINES_MODULE = YES;
923955
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -946,6 +978,7 @@
946978
buildSettings = {
947979
APPLICATION_EXTENSION_API_ONLY = YES;
948980
CLANG_ENABLE_MODULES = YES;
981+
CODE_SIGN_IDENTITY = "";
949982
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
950983
DEFINES_MODULE = YES;
951984
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -963,7 +996,6 @@
963996
SDKROOT = watchos;
964997
SKIP_INSTALL = YES;
965998
SUPPORTED_PLATFORMS = "watchos watchsimulator";
966-
SWIFT_VERSION = 4.2;
967999
TARGETED_DEVICE_FAMILY = 4;
9681000
};
9691001
name = Release;
@@ -987,7 +1019,7 @@
9871019
MACOSX_DEPLOYMENT_TARGET = 10.15;
9881020
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
9891021
MTL_FAST_MATH = YES;
990-
PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.ShareClientPlugin;
1022+
PRODUCT_BUNDLE_IDENTIFIER = com.loopkit.ShareClientPlugin;
9911023
PRODUCT_NAME = "$(TARGET_NAME)";
9921024
SDKROOT = iphoneos;
9931025
SKIP_INSTALL = YES;
@@ -1017,7 +1049,7 @@
10171049
MACH_O_TYPE = mh_dylib;
10181050
MACOSX_DEPLOYMENT_TARGET = 10.15;
10191051
MTL_FAST_MATH = YES;
1020-
PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.ShareClientPlugin;
1052+
PRODUCT_BUNDLE_IDENTIFIER = com.loopkit.ShareClientPlugin;
10211053
PRODUCT_NAME = "$(TARGET_NAME)";
10221054
SDKROOT = iphoneos;
10231055
SKIP_INSTALL = YES;

‎ShareClient.xcodeproj/xcshareddata/xcschemes/Shared-watchOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ShareClient.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -42,6 +42,16 @@
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
45+
<TestableReference
46+
skipped = "NO">
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "432B0E911CDFC3C50045347B"
50+
BuildableName = "ShareClientTests.xctest"
51+
BlueprintName = "ShareClientTests"
52+
ReferencedContainer = "container:ShareClient.xcodeproj">
53+
</BuildableReference>
54+
</TestableReference>
4555
</Testables>
4656
<MacroExpansion>
4757
<BuildableReference

‎ShareClient/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)-$(PLATFORM_NAME)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>
1414
<string>$(PRODUCT_NAME)</string>
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1</string>
18+
<string>1.2</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎ShareClient/da.lproj/Localizable.strings‎

548 Bytes
Binary file not shown.

‎ShareClient/fi.lproj/Localizable.strings‎

550 Bytes
Binary file not shown.

‎ShareClient/ja.lproj/Localizable.strings‎

532 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)