Skip to content

Commit b424bfd

Browse files
ps2ps2
committed
Merge remote-tracking branch 'diy/dev' into ps2/LOOP-4190/diy-sync
2 parents ffa64b2 + b4fe2ee commit b424bfd

File tree

6 files changed

+0
-215
lines changed

6 files changed

+0
-215
lines changed

‎Cartfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Cartfile.resolved

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

‎Scripts/carthage.sh

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

‎ShareClient.xcodeproj/project.pbxproj

Lines changed: 0 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
4325E9D3210E6ADA00969CE5 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9D2210E6ADA00969CE5 /* IdentifiableClass.swift */; };
1313
4325E9D5210E6B4400969CE5 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9D4210E6B4300969CE5 /* UIColor.swift */; };
1414
432B0E8C1CDFC3C50045347B /* ShareClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 432B0E8B1CDFC3C50045347B /* ShareClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
15-
432B0E931CDFC3C50045347B /* ShareClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 432B0E881CDFC3C50045347B /* ShareClient.framework */; };
16-
432B0E981CDFC3C50045347B /* ShareClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 432B0E971CDFC3C50045347B /* ShareClientTests.swift */; };
1715
43A8EC7C210E661400A81379 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43A8EC7B210E661400A81379 /* LoopKit.framework */; };
1816
43A8EC86210E664300A81379 /* ShareClientUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 43A8EC84210E664300A81379 /* ShareClientUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
1917
43A8EC8A210E664C00A81379 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43A8EC7B210E661400A81379 /* LoopKit.framework */; };
@@ -32,7 +30,6 @@
3230
43AB51362133177800B3D58D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB51352133177800B3D58D /* LocalizedString.swift */; };
3331
43AB51372133177800B3D58D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB51352133177800B3D58D /* LocalizedString.swift */; };
3432
43C418AF1CE0488900405B6A /* ShareClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418AE1CE0488900405B6A /* ShareClient.swift */; };
35-
A9AD06BC225ECDAC00471B4A /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43A8EC94210E67B000A81379 /* HealthKit.framework */; };
3633
A9ED4D93225EB4D30080DEBA /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9CE210E6A0A00969CE5 /* HKUnit.swift */; };
3734
A9ED4D94225EB4D30080DEBA /* TimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9D0210E6A3D00969CE5 /* TimeInterval.swift */; };
3835
A9ED4D95225EB4D30080DEBA /* ShareClientManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A8EC9C210E68CE00A81379 /* ShareClientManager.swift */; };
@@ -47,17 +44,9 @@
4744
B40BF26623ABD4E700A43CEE /* ShareClientPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40BF26523ABD4E700A43CEE /* ShareClientPlugin.swift */; };
4845
B40BF26823ABD55200A43CEE /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40BF26723ABD55200A43CEE /* OSLog.swift */; };
4946
B40BF26923ABD55200A43CEE /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40BF26723ABD55200A43CEE /* OSLog.swift */; };
50-
C17D3CC62184CC26003458C8 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43A8EC7B210E661400A81379 /* LoopKit.framework */; };
5147
/* End PBXBuildFile section */
5248

5349
/* Begin PBXContainerItemProxy section */
54-
432B0E941CDFC3C50045347B /* PBXContainerItemProxy */ = {
55-
isa = PBXContainerItemProxy;
56-
containerPortal = 432B0E7F1CDFC3C50045347B /* Project object */;
57-
proxyType = 1;
58-
remoteGlobalIDString = 432B0E871CDFC3C50045347B;
59-
remoteInfo = ShareClient;
60-
};
6150
A9E521F6225E949400EDDEF2 /* PBXContainerItemProxy */ = {
6251
isa = PBXContainerItemProxy;
6352
containerPortal = 432B0E7F1CDFC3C50045347B /* Project object */;
@@ -82,9 +71,6 @@
8271
432B0E881CDFC3C50045347B /* ShareClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ShareClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8372
432B0E8B1CDFC3C50045347B /* ShareClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareClient.h; sourceTree = "<group>"; };
8473
432B0E8D1CDFC3C50045347B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
85-
432B0E921CDFC3C50045347B /* ShareClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ShareClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
86-
432B0E971CDFC3C50045347B /* ShareClientTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareClientTests.swift; sourceTree = "<group>"; };
87-
432B0E991CDFC3C50045347B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8874
43A8EC7B210E661400A81379 /* LoopKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8975
43A8EC82210E664300A81379 /* ShareClientUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ShareClientUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9076
43A8EC84210E664300A81379 /* ShareClientUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareClientUI.h; sourceTree = "<group>"; };
@@ -157,16 +143,6 @@
157143
);
158144
runOnlyForDeploymentPostprocessing = 0;
159145
};
160-
432B0E8F1CDFC3C50045347B /* Frameworks */ = {
161-
isa = PBXFrameworksBuildPhase;
162-
buildActionMask = 2147483647;
163-
files = (
164-
A9AD06BC225ECDAC00471B4A /* HealthKit.framework in Frameworks */,
165-
432B0E931CDFC3C50045347B /* ShareClient.framework in Frameworks */,
166-
C17D3CC62184CC26003458C8 /* LoopKit.framework in Frameworks */,
167-
);
168-
runOnlyForDeploymentPostprocessing = 0;
169-
};
170146
43A8EC7E210E664300A81379 /* Frameworks */ = {
171147
isa = PBXFrameworksBuildPhase;
172148
buildActionMask = 2147483647;
@@ -201,7 +177,6 @@
201177
children = (
202178
43AB51342133176B00B3D58D /* Common */,
203179
432B0E8A1CDFC3C50045347B /* ShareClient */,
204-
432B0E961CDFC3C50045347B /* ShareClientTests */,
205180
43A8EC83210E664300A81379 /* ShareClientUI */,
206181
B40BF25F23ABD47400A43CEE /* ShareClientPlugin */,
207182
432B0E891CDFC3C50045347B /* Products */,
@@ -213,7 +188,6 @@
213188
isa = PBXGroup;
214189
children = (
215190
432B0E881CDFC3C50045347B /* ShareClient.framework */,
216-
432B0E921CDFC3C50045347B /* ShareClientTests.xctest */,
217191
43A8EC82210E664300A81379 /* ShareClientUI.framework */,
218192
A9ED4DA4225EB4D30080DEBA /* ShareClient.framework */,
219193
B40BF25E23ABD47400A43CEE /* ShareClientPlugin.loopplugin */,
@@ -238,15 +212,6 @@
238212
path = ShareClient;
239213
sourceTree = "<group>";
240214
};
241-
432B0E961CDFC3C50045347B /* ShareClientTests */ = {
242-
isa = PBXGroup;
243-
children = (
244-
432B0E971CDFC3C50045347B /* ShareClientTests.swift */,
245-
432B0E991CDFC3C50045347B /* Info.plist */,
246-
);
247-
path = ShareClientTests;
248-
sourceTree = "<group>";
249-
};
250215
43A8EC7A210E661300A81379 /* Frameworks */ = {
251216
isa = PBXGroup;
252217
children = (
@@ -340,25 +305,6 @@
340305
productReference = 432B0E881CDFC3C50045347B /* ShareClient.framework */;
341306
productType = "com.apple.product-type.framework";
342307
};
343-
432B0E911CDFC3C50045347B /* ShareClientTests */ = {
344-
isa = PBXNativeTarget;
345-
buildConfigurationList = 432B0E9F1CDFC3C50045347B /* Build configuration list for PBXNativeTarget "ShareClientTests" */;
346-
buildPhases = (
347-
432B0E8E1CDFC3C50045347B /* Sources */,
348-
432B0E8F1CDFC3C50045347B /* Frameworks */,
349-
432B0E901CDFC3C50045347B /* Resources */,
350-
A9F2C3E0225ECF8800C3B796 /* Copy Frameworks with Carthage */,
351-
);
352-
buildRules = (
353-
);
354-
dependencies = (
355-
432B0E951CDFC3C50045347B /* PBXTargetDependency */,
356-
);
357-
name = ShareClientTests;
358-
productName = ShareClientTests;
359-
productReference = 432B0E921CDFC3C50045347B /* ShareClientTests.xctest */;
360-
productType = "com.apple.product-type.bundle.unit-test";
361-
};
362308
43A8EC81210E664300A81379 /* ShareClientUI */ = {
363309
isa = PBXNativeTarget;
364310
buildConfigurationList = 43A8EC87210E664300A81379 /* Build configuration list for PBXNativeTarget "ShareClientUI" */;
@@ -428,10 +374,6 @@
428374
CreatedOnToolsVersion = 7.3.1;
429375
LastSwiftMigration = 1020;
430376
};
431-
432B0E911CDFC3C50045347B = {
432-
CreatedOnToolsVersion = 7.3.1;
433-
LastSwiftMigration = 1020;
434-
};
435377
43A8EC81210E664300A81379 = {
436378
CreatedOnToolsVersion = 9.4.1;
437379
LastSwiftMigration = 1020;
@@ -477,7 +419,6 @@
477419
targets = (
478420
432B0E871CDFC3C50045347B /* ShareClient */,
479421
A9ED4D91225EB4D30080DEBA /* ShareClient-watchOS */,
480-
432B0E911CDFC3C50045347B /* ShareClientTests */,
481422
43A8EC81210E664300A81379 /* ShareClientUI */,
482423
B40BF25D23ABD47400A43CEE /* ShareClientPlugin */,
483424
);
@@ -493,13 +434,6 @@
493434
);
494435
runOnlyForDeploymentPostprocessing = 0;
495436
};
496-
432B0E901CDFC3C50045347B /* Resources */ = {
497-
isa = PBXResourcesBuildPhase;
498-
buildActionMask = 2147483647;
499-
files = (
500-
);
501-
runOnlyForDeploymentPostprocessing = 0;
502-
};
503437
43A8EC80210E664300A81379 /* Resources */ = {
504438
isa = PBXResourcesBuildPhase;
505439
buildActionMask = 2147483647;
@@ -525,29 +459,6 @@
525459
};
526460
/* End PBXResourcesBuildPhase section */
527461

528-
/* Begin PBXShellScriptBuildPhase section */
529-
A9F2C3E0225ECF8800C3B796 /* Copy Frameworks with Carthage */ = {
530-
isa = PBXShellScriptBuildPhase;
531-
buildActionMask = 2147483647;
532-
files = (
533-
);
534-
inputFileListPaths = (
535-
);
536-
inputPaths = (
537-
"$(BUILT_PRODUCTS_DIR)/LoopKit.framework",
538-
);
539-
name = "Copy Frameworks with Carthage";
540-
outputFileListPaths = (
541-
);
542-
outputPaths = (
543-
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/LoopKit.framework",
544-
);
545-
runOnlyForDeploymentPostprocessing = 0;
546-
shellPath = /bin/sh;
547-
shellScript = "CARTHAGE_BUILD_DIR=\"${SRCROOT}/Carthage/Build\"\nif [ -n \"${IPHONEOS_DEPLOYMENT_TARGET}\" ]; then\n CARTHAGE_BUILD_DIR=\"${CARTHAGE_BUILD_DIR}/iOS\"\nelif [ -n \"${WATCHOS_DEPLOYMENT_TARGET}\" ]; then\n CARTHAGE_BUILD_DIR=\"${CARTHAGE_BUILD_DIR}/watchOS\"\nelse\n echo \"ERROR: Unexpected deployment target type\"\n exit 1\nfi\n\nfor SCRIPT_INPUT_FILE in ${!SCRIPT_INPUT_FILE_*}; do\n CARTHAGE_BUILD_FILE=\"${!SCRIPT_INPUT_FILE/${BUILT_PRODUCTS_DIR}/${CARTHAGE_BUILD_DIR}}\"\n if [ -e \"${CARTHAGE_BUILD_FILE}\" ]; then\n if [ -e \"${SCRIPT_INPUT_FILE}\" ]; then\n echo \"ERROR: Duplicate frameworks found at:\"\n echo \" ${SCRIPT_INPUT_FILE}\"\n echo \" ${CARTHAGE_BUILD_FILE}\"\n exit 1\n fi\n echo \"Substituting \\\"${CARTHAGE_BUILD_FILE}\\\" for \\\"${!SCRIPT_INPUT_FILE}\\\"\"\n export ${SCRIPT_INPUT_FILE}=\"${CARTHAGE_BUILD_FILE}\"\n fi\ndone\n\necho \"Copy Frameworks with Carthage\"\ncarthage copy-frameworks\n";
548-
};
549-
/* End PBXShellScriptBuildPhase section */
550-
551462
/* Begin PBXSourcesBuildPhase section */
552463
432B0E831CDFC3C50045347B /* Sources */ = {
553464
isa = PBXSourcesBuildPhase;
@@ -564,14 +475,6 @@
564475
);
565476
runOnlyForDeploymentPostprocessing = 0;
566477
};
567-
432B0E8E1CDFC3C50045347B /* Sources */ = {
568-
isa = PBXSourcesBuildPhase;
569-
buildActionMask = 2147483647;
570-
files = (
571-
432B0E981CDFC3C50045347B /* ShareClientTests.swift in Sources */,
572-
);
573-
runOnlyForDeploymentPostprocessing = 0;
574-
};
575478
43A8EC7D210E664300A81379 /* Sources */ = {
576479
isa = PBXSourcesBuildPhase;
577480
buildActionMask = 2147483647;
@@ -612,11 +515,6 @@
612515
/* End PBXSourcesBuildPhase section */
613516

614517
/* Begin PBXTargetDependency section */
615-
432B0E951CDFC3C50045347B /* PBXTargetDependency */ = {
616-
isa = PBXTargetDependency;
617-
target = 432B0E871CDFC3C50045347B /* ShareClient */;
618-
targetProxy = 432B0E941CDFC3C50045347B /* PBXContainerItemProxy */;
619-
};
620518
A9E521F7225E949400EDDEF2 /* PBXTargetDependency */ = {
621519
isa = PBXTargetDependency;
622520
target = 432B0E871CDFC3C50045347B /* ShareClient */;
@@ -856,28 +754,6 @@
856754
};
857755
name = Release;
858756
};
859-
432B0EA01CDFC3C50045347B /* Debug */ = {
860-
isa = XCBuildConfiguration;
861-
buildSettings = {
862-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
863-
INFOPLIST_FILE = ShareClientTests/Info.plist;
864-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
865-
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;
866-
PRODUCT_NAME = "$(TARGET_NAME)";
867-
};
868-
name = Debug;
869-
};
870-
432B0EA11CDFC3C50045347B /* Release */ = {
871-
isa = XCBuildConfiguration;
872-
buildSettings = {
873-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
874-
INFOPLIST_FILE = ShareClientTests/Info.plist;
875-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
876-
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;
877-
PRODUCT_NAME = "$(TARGET_NAME)";
878-
};
879-
name = Release;
880-
};
881757
43A8EC88210E664300A81379 /* Debug */ = {
882758
isa = XCBuildConfiguration;
883759
buildSettings = {
@@ -1068,15 +944,6 @@
1068944
defaultConfigurationIsVisible = 0;
1069945
defaultConfigurationName = Release;
1070946
};
1071-
432B0E9F1CDFC3C50045347B /* Build configuration list for PBXNativeTarget "ShareClientTests" */ = {
1072-
isa = XCConfigurationList;
1073-
buildConfigurations = (
1074-
432B0EA01CDFC3C50045347B /* Debug */,
1075-
432B0EA11CDFC3C50045347B /* Release */,
1076-
);
1077-
defaultConfigurationIsVisible = 0;
1078-
defaultConfigurationName = Release;
1079-
};
1080947
43A8EC87210E664300A81379 /* Build configuration list for PBXNativeTarget "ShareClientUI" */ = {
1081948
isa = XCConfigurationList;
1082949
buildConfigurations = (

‎ShareClientTests/Info.plist

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

‎ShareClientTests/ShareClientTests.swift

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

0 commit comments

Comments
 (0)