Skip to content

Commit c53d44a

Browse files
committed
Fix tests
1 parent 81f6539 commit c53d44a

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "LoopKit/LoopKit" "1c23bb5fd54c0b0aaa81dbabcb35f2d4c9c2e8cf"
1+
github "LoopKit/LoopKit" "0f12e7a973625be59ea617166fea7bd2e0f6d729"

ShareClient.xcodeproj/project.pbxproj

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
43AB51362133177800B3D58D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB51352133177800B3D58D /* LocalizedString.swift */; };
4747
43AB51372133177800B3D58D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB51352133177800B3D58D /* LocalizedString.swift */; };
4848
43C418AF1CE0488900405B6A /* ShareClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418AE1CE0488900405B6A /* ShareClient.swift */; };
49+
C17D3CC52184CBCD003458C8 /* LoopKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43A8EC7B210E661400A81379 /* LoopKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
50+
C17D3CC62184CC26003458C8 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43A8EC7B210E661400A81379 /* LoopKit.framework */; };
4951
/* End PBXBuildFile section */
5052

5153
/* Begin PBXContainerItemProxy section */
@@ -72,6 +74,19 @@
7274
};
7375
/* End PBXContainerItemProxy section */
7476

77+
/* Begin PBXCopyFilesBuildPhase section */
78+
C17D3CC42184CBB7003458C8 /* CopyFiles */ = {
79+
isa = PBXCopyFilesBuildPhase;
80+
buildActionMask = 2147483647;
81+
dstPath = "";
82+
dstSubfolderSpec = 10;
83+
files = (
84+
C17D3CC52184CBCD003458C8 /* LoopKit.framework in CopyFiles */,
85+
);
86+
runOnlyForDeploymentPostprocessing = 0;
87+
};
88+
/* End PBXCopyFilesBuildPhase section */
89+
7590
/* Begin PBXFileReference section */
7691
4325E9CE210E6A0A00969CE5 /* HKUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HKUnit.swift; sourceTree = "<group>"; };
7792
4325E9D0210E6A3D00969CE5 /* TimeInterval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeInterval.swift; sourceTree = "<group>"; };
@@ -135,6 +150,7 @@
135150
buildActionMask = 2147483647;
136151
files = (
137152
432B0E931CDFC3C50045347B /* ShareClient.framework in Frameworks */,
153+
C17D3CC62184CC26003458C8 /* LoopKit.framework in Frameworks */,
138154
);
139155
runOnlyForDeploymentPostprocessing = 0;
140156
};
@@ -280,6 +296,7 @@
280296
432B0E8E1CDFC3C50045347B /* Sources */,
281297
432B0E8F1CDFC3C50045347B /* Frameworks */,
282298
432B0E901CDFC3C50045347B /* Resources */,
299+
C17D3CC42184CBB7003458C8 /* CopyFiles */,
283300
);
284301
buildRules = (
285302
);
@@ -408,7 +425,7 @@
408425
);
409426
runOnlyForDeploymentPostprocessing = 0;
410427
shellPath = /bin/sh;
411-
shellScript = "if [ \"$CARTHAGE\" = \"YES\" ]; then\n echo \"Skipping carthage build because we're already in one\"\nelif [ -d $PROJECT_DIR/../../../Loop.xcworkspace ]; then\n echo \"Skipping carthage build because we're in a workspace\"\nelif [ -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 /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
428+
shellScript = "if [ \"$CARTHAGE\" = \"YES\" ]; then\n echo \"Skipping carthage build because we're already in one\"\nelif [ -d $PROJECT_DIR/../../../Loop.xcworkspace ]; then\n echo \"Skipping carthage build because we're in a workspace\"\nelif [ -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 unset LLVM_TARGET_TRIPLE_SUFFIX\n echo \"Bootstrapping carthage dependencies\"\n /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
412429
};
413430
/* End PBXShellScriptBuildPhase section */
414431

@@ -697,6 +714,10 @@
697714
432B0EA01CDFC3C50045347B /* Debug */ = {
698715
isa = XCBuildConfiguration;
699716
buildSettings = {
717+
FRAMEWORK_SEARCH_PATHS = (
718+
"$(inherited),",
719+
"$(PROJECT_DIR)/Carthage/Build/iOS",
720+
);
700721
INFOPLIST_FILE = ShareClientTests/Info.plist;
701722
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
702723
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;
@@ -708,6 +729,10 @@
708729
432B0EA11CDFC3C50045347B /* Release */ = {
709730
isa = XCBuildConfiguration;
710731
buildSettings = {
732+
FRAMEWORK_SEARCH_PATHS = (
733+
"$(inherited),",
734+
"$(PROJECT_DIR)/Carthage/Build/iOS",
735+
);
711736
INFOPLIST_FILE = ShareClientTests/Info.plist;
712737
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
713738
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;

0 commit comments

Comments
 (0)