Skip to content
This repository was archived by the owner on Aug 3, 2020. It is now read-only.

Commit b3eb7f1

Browse files
AlexanderNAlexanderN
authored
Develop (#5)
* Fixed dependency issue * Removed un-necessary framework references, exposed scheme for parser * Set ALWAYS_SEARCH_USER_PATHS to NO to avoid warning. * Removed parser from workspace and made it part of the Cartfile to prevent embedding issues. * Fixed header search path for parser
1 parent d41479d commit b3eb7f1

File tree

6 files changed

+114
-15
lines changed

6 files changed

+114
-15
lines changed

‎ccdamobile.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ccdaparser/ccdaparser.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3071,18 +3071,20 @@
30713071
56A583C01CB20529007B8F3E /* Debug */ = {
30723072
isa = XCBuildConfiguration;
30733073
buildSettings = {
3074-
ALWAYS_SEARCH_USER_PATHS = YES;
3074+
ALWAYS_SEARCH_USER_PATHS = NO;
30753075
CODE_SIGN_IDENTITY = "iPhone Developer";
30763076
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
30773077
DEFINES_MODULE = YES;
30783078
DYLIB_COMPATIBILITY_VERSION = 1;
30793079
DYLIB_CURRENT_VERSION = 1;
30803080
DYLIB_INSTALL_NAME_BASE = "@rpath";
30813081
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
3082+
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
30823083
INFOPLIST_FILE = ccdaparser/Info.plist;
30833084
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
30843085
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
30853086
ONLY_ACTIVE_ARCH = NO;
3087+
OTHER_LDFLAGS = "";
30863088
PRODUCT_BUNDLE_IDENTIFIER = coladapp.com.ccdaparser;
30873089
PRODUCT_NAME = "$(TARGET_NAME)";
30883090
PROVISIONING_PROFILE = "";
@@ -3094,17 +3096,19 @@
30943096
56A583C11CB20529007B8F3E /* Release */ = {
30953097
isa = XCBuildConfiguration;
30963098
buildSettings = {
3097-
ALWAYS_SEARCH_USER_PATHS = YES;
3099+
ALWAYS_SEARCH_USER_PATHS = NO;
30983100
CODE_SIGN_IDENTITY = "iPhone Developer";
30993101
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
31003102
DEFINES_MODULE = YES;
31013103
DYLIB_COMPATIBILITY_VERSION = 1;
31023104
DYLIB_CURRENT_VERSION = 1;
31033105
DYLIB_INSTALL_NAME_BASE = "@rpath";
31043106
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
3107+
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
31053108
INFOPLIST_FILE = ccdaparser/Info.plist;
31063109
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
31073110
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3111+
OTHER_LDFLAGS = "";
31083112
PRODUCT_BUNDLE_IDENTIFIER = coladapp.com.ccdaparser;
31093113
PRODUCT_NAME = "$(TARGET_NAME)";
31103114
PROVISIONING_PROFILE = "";

‎ccdaparser/ccdaparser.xcodeproj/xcshareddata/xcschemes/ccdaparser.xcscheme

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0730"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
18+
BuildableName = "ccdaparser.framework"
19+
BlueprintName = "ccdaparser"
20+
ReferencedContainer = "container:ccdaparser.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "56A583B41CB20529007B8F3E"
36+
BuildableName = "ccdaparserTests.xctest"
37+
BlueprintName = "ccdaparserTests"
38+
ReferencedContainer = "container:ccdaparser.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
46+
BuildableName = "ccdaparser.framework"
47+
BlueprintName = "ccdaparser"
48+
ReferencedContainer = "container:ccdaparser.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<MacroExpansion>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
68+
BuildableName = "ccdaparser.framework"
69+
BlueprintName = "ccdaparser"
70+
ReferencedContainer = "container:ccdaparser.xcodeproj">
71+
</BuildableReference>
72+
</MacroExpansion>
73+
<AdditionalOptions>
74+
</AdditionalOptions>
75+
</LaunchAction>
76+
<ProfileAction
77+
buildConfiguration = "Release"
78+
shouldUseLaunchSchemeArgsEnv = "YES"
79+
savedToolIdentifier = ""
80+
useCustomWorkingDirectory = "NO"
81+
debugDocumentVersioning = "YES">
82+
<MacroExpansion>
83+
<BuildableReference
84+
BuildableIdentifier = "primary"
85+
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
86+
BuildableName = "ccdaparser.framework"
87+
BlueprintName = "ccdaparser"
88+
ReferencedContainer = "container:ccdaparser.xcodeproj">
89+
</BuildableReference>
90+
</MacroExpansion>
91+
</ProfileAction>
92+
<AnalyzeAction
93+
buildConfiguration = "Debug">
94+
</AnalyzeAction>
95+
<ArchiveAction
96+
buildConfiguration = "Release"
97+
revealArchiveInOrganizer = "YES">
98+
</ArchiveAction>
99+
</Scheme>

‎ccdaviewer/Cartfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
github "SVProgressHUD/SVProgressHUD"
1+
github "SVProgressHUD/SVProgressHUD"
2+
github "alexandern/ccdaviewer" "develop"

‎ccdaviewer/Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "MatiBot/MBCircularProgressBar" "0.3.4"
21
github "SVProgressHUD/SVProgressHUD" "2.0.3"
2+
github "alexandern/ccdaviewer" "9384a0cf6a25ab38a252a2db5eda2955b1ff5305"

‎ccdaviewer/ccdaviewer.xcodeproj/project.pbxproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@
8080
56A584161CB205F9007B8F3E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56A584141CB205F9007B8F3E /* Main.storyboard */; };
8181
56A5841B1CB205F9007B8F3E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56A584191CB205F9007B8F3E /* LaunchScreen.storyboard */; };
8282
56A584261CB205F9007B8F3E /* ccdaviewerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 56A584251CB205F9007B8F3E /* ccdaviewerTests.m */; };
83-
56ACDE401CE7AB1900E43AB3 /* ccdaparser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */; };
84-
56ACDE411CE7AB1900E43AB3 /* ccdaparser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8583
56B168C81CF1D56F008E7324 /* MMStopwatchARC.m in Sources */ = {isa = PBXBuildFile; fileRef = 56B168C71CF1D56F008E7324 /* MMStopwatchARC.m */; };
8684
56B16EC21D3C141D00170694 /* Patient.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56B16EC11D3C141D00170694 /* Patient.storyboard */; };
8785
56B16EC61D3C3A5600170694 /* PatientViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56B16EC51D3C3A5600170694 /* PatientViewController.m */; };
@@ -103,6 +101,8 @@
103101
56E50D041CE2A65B00705FED /* FHIRPeriod.m in Sources */ = {isa = PBXBuildFile; fileRef = 56E50CFD1CE2A65B00705FED /* FHIRPeriod.m */; };
104102
56E50D051CE2A65B00705FED /* FHIRTelecom.m in Sources */ = {isa = PBXBuildFile; fileRef = 56E50CFF1CE2A65B00705FED /* FHIRTelecom.m */; };
105103
56EF9AEC1CDE2522002ED9B3 /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = 56EF9AEB1CDE2522002ED9B3 /* ReadMe.txt */; };
104+
87D53B5C1D871B3B00B5C758 /* ccdaparser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */; };
105+
87D53B5D1D871B3B00B5C758 /* ccdaparser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
106106
/* End PBXBuildFile section */
107107

108108
/* Begin PBXContainerItemProxy section */
@@ -122,8 +122,8 @@
122122
dstPath = "";
123123
dstSubfolderSpec = 10;
124124
files = (
125+
87D53B5D1D871B3B00B5C758 /* ccdaparser.framework in Embed Frameworks */,
125126
56C71A881CF804440024CFF2 /* SVProgressHUD.framework in Embed Frameworks */,
126-
56ACDE411CE7AB1900E43AB3 /* ccdaparser.framework in Embed Frameworks */,
127127
);
128128
name = "Embed Frameworks";
129129
runOnlyForDeploymentPostprocessing = 0;
@@ -188,7 +188,6 @@
188188
5649E7731D66D72B000DBA11 /* NSDate+Formatting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Formatting.m"; sourceTree = "<group>"; };
189189
564A00DB1CFB716D0011A5EE /* UIColor+LightAndDark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+LightAndDark.h"; sourceTree = "<group>"; };
190190
564A00DC1CFB716D0011A5EE /* UIColor+LightAndDark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+LightAndDark.m"; sourceTree = "<group>"; };
191-
564A00E51CFB8CDB0011A5EE /* MBCircularProgressBar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MBCircularProgressBar.framework; path = Carthage/Build/iOS/MBCircularProgressBar.framework; sourceTree = "<group>"; };
192191
564DD2881D6A6391002D4E0C /* ViewerResultsCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ViewerResultsCell.xib; sourceTree = "<group>"; };
193192
564DD28A1D6A63FC002D4E0C /* ViewerResultsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewerResultsCell.h; sourceTree = "<group>"; };
194193
564DD28B1D6A63FC002D4E0C /* ViewerResultsCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewerResultsCell.m; sourceTree = "<group>"; };
@@ -261,7 +260,6 @@
261260
56A584211CB205F9007B8F3E /* ccdaviewerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ccdaviewerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
262261
56A584251CB205F9007B8F3E /* ccdaviewerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ccdaviewerTests.m; sourceTree = "<group>"; };
263262
56A584271CB205F9007B8F3E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
264-
56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = ccdaparser.framework; path = "/Users/us/Library/Developer/Xcode/DerivedData/ccdamobile-hbscwdcilsoearakyedfonktpubr/Build/Products/Debug-iphoneos/ccdaparser.framework"; sourceTree = "<absolute>"; };
265263
56B168C61CF1D56F008E7324 /* MMStopwatchARC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMStopwatchARC.h; sourceTree = "<group>"; };
266264
56B168C71CF1D56F008E7324 /* MMStopwatchARC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMStopwatchARC.m; sourceTree = "<group>"; };
267265
56B16EC11D3C141D00170694 /* Patient.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Patient.storyboard; sourceTree = "<group>"; };
@@ -300,15 +298,16 @@
300298
56E50CFE1CE2A65B00705FED /* FHIRTelecom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FHIRTelecom.h; sourceTree = "<group>"; };
301299
56E50CFF1CE2A65B00705FED /* FHIRTelecom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FHIRTelecom.m; sourceTree = "<group>"; };
302300
56EF9AEB1CDE2522002ED9B3 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
301+
87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ccdaparser.framework; path = Carthage/Build/iOS/ccdaparser.framework; sourceTree = "<group>"; };
303302
/* End PBXFileReference section */
304303

305304
/* Begin PBXFrameworksBuildPhase section */
306305
56A584051CB205F9007B8F3E /* Frameworks */ = {
307306
isa = PBXFrameworksBuildPhase;
308307
buildActionMask = 2147483647;
309308
files = (
309+
87D53B5C1D871B3B00B5C758 /* ccdaparser.framework in Frameworks */,
310310
56C71A871CF804440024CFF2 /* SVProgressHUD.framework in Frameworks */,
311-
56ACDE401CE7AB1900E43AB3 /* ccdaparser.framework in Frameworks */,
312311
);
313312
runOnlyForDeploymentPostprocessing = 0;
314313
};
@@ -325,6 +324,7 @@
325324
2ADA1228C5A01C27B2A8559C /* Frameworks */ = {
326325
isa = PBXGroup;
327326
children = (
327+
87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */,
328328
);
329329
name = Frameworks;
330330
sourceTree = "<group>";
@@ -608,9 +608,7 @@
608608
56A583FF1CB205F9007B8F3E = {
609609
isa = PBXGroup;
610610
children = (
611-
564A00E51CFB8CDB0011A5EE /* MBCircularProgressBar.framework */,
612611
56C71A861CF804430024CFF2 /* SVProgressHUD.framework */,
613-
56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */,
614612
5665084C1CE03FE4001D8AD1 /* Localizable.strings */,
615613
56A5840A1CB205F9007B8F3E /* ccdaviewer */,
616614
56A584241CB205F9007B8F3E /* ccdaviewerTests */,

0 commit comments

Comments
 (0)