Skip to content

Commit

Permalink
Merge pull request #18 from levey/master
Browse files Browse the repository at this point in the history 
Update CocoaPods dependency configuration, avoid duplicate symbol issue.
  • Loading branch information
@jdiehl
jdiehl committed Dec 25, 2015
2 parents 50d4847 + ef4f2f8 commit a032896
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 41 deletions.
6 changes: 4 additions & 2 deletions AsyncNetwork.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/jdiehl/async-network.git", :tag => s.version.to_s }

s.requires_arc = true
s.source_files = 'AsyncNetwork/**/*.[mh]'
s.public_header_files = 'AsyncNetwork/**/*.h'

s.source_files = 'AsyncNetwork'

s.osx.frameworks = 'CFNetwork', 'Security'
s.osx.deployment_target = '10.7'

s.ios.frameworks = 'CFNetwork', 'Security'
s.ios.deployment_target = '5.0'

s.dependency 'CocoaAsyncSocket'
end
77 changes: 38 additions & 39 deletions AsyncNetwork.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@
2D30BFB81AB60208007799AF /* AsyncNetworkHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D2467F21518015D00101EAB /* AsyncNetworkHelpers.m */; };
2D30BFB91AB60208007799AF /* AsyncRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D2467F41518015D00101EAB /* AsyncRequest.m */; };
2D30BFBA1AB60208007799AF /* AsyncServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D2467F61518015D00101EAB /* AsyncServer.m */; };
2D7DC8B81C2A927F00353FFA /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7DC8B31C2A927F00353FFA /* GCDAsyncSocket.h */; };
2D7DC8B91C2A927F00353FFA /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7DC8B31C2A927F00353FFA /* GCDAsyncSocket.h */; };
2D7DC8BA1C2A927F00353FFA /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DC8B41C2A927F00353FFA /* GCDAsyncSocket.m */; };
2D7DC8BB1C2A927F00353FFA /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DC8B41C2A927F00353FFA /* GCDAsyncSocket.m */; };
2D7DC8BC1C2A927F00353FFA /* GCDAsyncUdpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7DC8B51C2A927F00353FFA /* GCDAsyncUdpSocket.h */; };
2D7DC8BD1C2A927F00353FFA /* GCDAsyncUdpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7DC8B51C2A927F00353FFA /* GCDAsyncUdpSocket.h */; };
2D7DC8BE1C2A927F00353FFA /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DC8B61C2A927F00353FFA /* GCDAsyncUdpSocket.m */; };
2D7DC8BF1C2A927F00353FFA /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DC8B61C2A927F00353FFA /* GCDAsyncUdpSocket.m */; };
2D7DC8C01C2A927F00353FFA /* README.markdown in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DC8B71C2A927F00353FFA /* README.markdown */; };
2D7DC8C11C2A927F00353FFA /* README.markdown in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DC8B71C2A927F00353FFA /* README.markdown */; };
2DB62DDF1ABAA848002B3866 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DB62DDE1ABAA848002B3866 /* Security.framework */; };
2DF1E3A11AB9DF780072166F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DF1E3A01AB9DF780072166F /* CFNetwork.framework */; };
2DF1E3A31AB9DF7D0072166F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DF1E3A21AB9DF7D0072166F /* CFNetwork.framework */; };
5C568BF31C2CE598002632CE /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C568BEE1C2CE597002632CE /* GCDAsyncSocket.h */; };
5C568BF41C2CE598002632CE /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C568BEE1C2CE597002632CE /* GCDAsyncSocket.h */; };
5C568BF51C2CE598002632CE /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C568BEF1C2CE598002632CE /* GCDAsyncSocket.m */; };
5C568BF61C2CE598002632CE /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C568BEF1C2CE598002632CE /* GCDAsyncSocket.m */; };
5C568BF71C2CE598002632CE /* GCDAsyncUdpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C568BF01C2CE598002632CE /* GCDAsyncUdpSocket.h */; };
5C568BF81C2CE598002632CE /* GCDAsyncUdpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C568BF01C2CE598002632CE /* GCDAsyncUdpSocket.h */; };
5C568BF91C2CE598002632CE /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C568BF11C2CE598002632CE /* GCDAsyncUdpSocket.m */; };
5C568BFA1C2CE598002632CE /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C568BF11C2CE598002632CE /* GCDAsyncUdpSocket.m */; };
5C568BFB1C2CE598002632CE /* README.markdown in Sources */ = {isa = PBXBuildFile; fileRef = 5C568BF21C2CE598002632CE /* README.markdown */; };
5C568BFC1C2CE598002632CE /* README.markdown in Sources */ = {isa = PBXBuildFile; fileRef = 5C568BF21C2CE598002632CE /* README.markdown */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -71,11 +71,6 @@
2D2467F41518015D00101EAB /* AsyncRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsyncRequest.m; sourceTree = "<group>"; };
2D2467F51518015D00101EAB /* AsyncServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncServer.h; sourceTree = "<group>"; };
2D2467F61518015D00101EAB /* AsyncServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsyncServer.m; sourceTree = "<group>"; };
2D7DC8B31C2A927F00353FFA /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = "<group>"; };
2D7DC8B41C2A927F00353FFA /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
2D7DC8B51C2A927F00353FFA /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncUdpSocket.h; sourceTree = "<group>"; };
2D7DC8B61C2A927F00353FFA /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncUdpSocket.m; sourceTree = "<group>"; };
2D7DC8B71C2A927F00353FFA /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.markdown; sourceTree = "<group>"; };
2DA0082C1520E36A001B2551 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
2DA5F1171AB5FABE00A8A65F /* AsyncNetworkIOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AsyncNetworkIOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2DA5F1351AB5FAF300A8A65F /* AsyncNetwork.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AsyncNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -84,6 +79,11 @@
2DB62DDE1ABAA848002B3866 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
2DF1E3A01AB9DF780072166F /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
2DF1E3A21AB9DF7D0072166F /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.2.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
5C568BEE1C2CE597002632CE /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = "<group>"; };
5C568BEF1C2CE598002632CE /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
5C568BF01C2CE598002632CE /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncUdpSocket.h; sourceTree = "<group>"; };
5C568BF11C2CE598002632CE /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncUdpSocket.m; sourceTree = "<group>"; };
5C568BF21C2CE598002632CE /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.markdown; sourceTree = "<group>"; };
FC698FC71632B3AC006418D6 /* NSNetService+AsyncRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNetService+AsyncRequest.h"; sourceTree = "<group>"; };
FC698FC81632B3AC006418D6 /* NSNetService+AsyncRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSNetService+AsyncRequest.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -113,7 +113,7 @@
isa = PBXGroup;
children = (
2D1D67681518088E0039CE94 /* README.md */,
2D7DC8B21C2A927F00353FFA /* CocoaAsyncSocket */,
5C568BED1C2CE597002632CE /* CocoaAsyncSocket */,
2D2467CF151800AB00101EAB /* AsyncNetwork */,
2DA5F1431AB5FAF300A8A65F /* AsyncNetworkTests */,
2D2467C8151800AB00101EAB /* Frameworks */,
Expand Down Expand Up @@ -175,19 +175,6 @@
name = "Supporting Files";
sourceTree = "<group>";
};
2D7DC8B21C2A927F00353FFA /* CocoaAsyncSocket */ = {
isa = PBXGroup;
children = (
2D7DC8B31C2A927F00353FFA /* GCDAsyncSocket.h */,
2D7DC8B41C2A927F00353FFA /* GCDAsyncSocket.m */,
2D7DC8B51C2A927F00353FFA /* GCDAsyncUdpSocket.h */,
2D7DC8B61C2A927F00353FFA /* GCDAsyncUdpSocket.m */,
2D7DC8B71C2A927F00353FFA /* README.markdown */,
);
name = CocoaAsyncSocket;
path = AsyncNetwork/CocoaAsyncSocket;
sourceTree = "<group>";
};
2DA5F1431AB5FAF300A8A65F /* AsyncNetworkTests */ = {
isa = PBXGroup;
children = (
Expand All @@ -205,6 +192,18 @@
name = "Supporting Files";
sourceTree = "<group>";
};
5C568BED1C2CE597002632CE /* CocoaAsyncSocket */ = {
isa = PBXGroup;
children = (
5C568BEE1C2CE597002632CE /* GCDAsyncSocket.h */,
5C568BEF1C2CE598002632CE /* GCDAsyncSocket.m */,
5C568BF01C2CE598002632CE /* GCDAsyncUdpSocket.h */,
5C568BF11C2CE598002632CE /* GCDAsyncUdpSocket.m */,
5C568BF21C2CE598002632CE /* README.markdown */,
);
path = CocoaAsyncSocket;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand All @@ -213,11 +212,11 @@
buildActionMask = 2147483647;
files = (
2D30BFAC1AB601FC007799AF /* AsyncServer.h in Headers */,
5C568BF81C2CE598002632CE /* GCDAsyncUdpSocket.h in Headers */,
2D30BFA61AB601FC007799AF /* AsyncBroadcaster.h in Headers */,
2D7DC8B91C2A927F00353FFA /* GCDAsyncSocket.h in Headers */,
5C568BF41C2CE598002632CE /* GCDAsyncSocket.h in Headers */,
2D30BFA81AB601FC007799AF /* AsyncConnection.h in Headers */,
2D30BFAA1AB601FC007799AF /* AsyncNetworkHelpers.h in Headers */,
2D7DC8BD1C2A927F00353FFA /* GCDAsyncUdpSocket.h in Headers */,
2D30BFA51AB601FC007799AF /* NSNetService+AsyncRequest.h in Headers */,
2D30BFA91AB601FC007799AF /* AsyncNetwork.h in Headers */,
2D30BFA71AB601FC007799AF /* AsyncClient.h in Headers */,
Expand All @@ -230,11 +229,11 @@
buildActionMask = 2147483647;
files = (
2D30BFA41AB601FB007799AF /* AsyncServer.h in Headers */,
5C568BF71C2CE598002632CE /* GCDAsyncUdpSocket.h in Headers */,
2D30BF9E1AB601FB007799AF /* AsyncBroadcaster.h in Headers */,
2D7DC8B81C2A927F00353FFA /* GCDAsyncSocket.h in Headers */,
5C568BF31C2CE598002632CE /* GCDAsyncSocket.h in Headers */,
2D30BFA01AB601FB007799AF /* AsyncConnection.h in Headers */,
2D30BFA21AB601FB007799AF /* AsyncNetworkHelpers.h in Headers */,
2D7DC8BC1C2A927F00353FFA /* GCDAsyncUdpSocket.h in Headers */,
2D30BF9D1AB601FB007799AF /* NSNetService+AsyncRequest.h in Headers */,
2D30BFA11AB601FB007799AF /* AsyncNetwork.h in Headers */,
2D30BF9F1AB601FB007799AF /* AsyncClient.h in Headers */,
Expand Down Expand Up @@ -339,13 +338,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2D7DC8BF1C2A927F00353FFA /* GCDAsyncUdpSocket.m in Sources */,
2D7DC8C11C2A927F00353FFA /* README.markdown in Sources */,
5C568BF61C2CE598002632CE /* GCDAsyncSocket.m in Sources */,
5C568BFA1C2CE598002632CE /* GCDAsyncUdpSocket.m in Sources */,
2D30BFB91AB60208007799AF /* AsyncRequest.m in Sources */,
2D30BFB81AB60208007799AF /* AsyncNetworkHelpers.m in Sources */,
2D30BFB41AB60208007799AF /* NSNetService+AsyncRequest.m in Sources */,
2D30BFB51AB60208007799AF /* AsyncBroadcaster.m in Sources */,
2D7DC8BB1C2A927F00353FFA /* GCDAsyncSocket.m in Sources */,
5C568BFC1C2CE598002632CE /* README.markdown in Sources */,
2D30BFB71AB60208007799AF /* AsyncConnection.m in Sources */,
2D30BFB61AB60208007799AF /* AsyncClient.m in Sources */,
2D30BFBA1AB60208007799AF /* AsyncServer.m in Sources */,
Expand All @@ -356,13 +355,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2D7DC8BE1C2A927F00353FFA /* GCDAsyncUdpSocket.m in Sources */,
2D7DC8C01C2A927F00353FFA /* README.markdown in Sources */,
5C568BF51C2CE598002632CE /* GCDAsyncSocket.m in Sources */,
5C568BF91C2CE598002632CE /* GCDAsyncUdpSocket.m in Sources */,
2D30BFB21AB60208007799AF /* AsyncRequest.m in Sources */,
2D30BFB11AB60208007799AF /* AsyncNetworkHelpers.m in Sources */,
2D30BFAD1AB60208007799AF /* NSNetService+AsyncRequest.m in Sources */,
2D30BFAE1AB60208007799AF /* AsyncBroadcaster.m in Sources */,
2D7DC8BA1C2A927F00353FFA /* GCDAsyncSocket.m in Sources */,
5C568BFB1C2CE598002632CE /* README.markdown in Sources */,
2D30BFB01AB60208007799AF /* AsyncConnection.m in Sources */,
2D30BFAF1AB60208007799AF /* AsyncClient.m in Sources */,
2D30BFB31AB60208007799AF /* AsyncServer.m in Sources */,
Expand Down
0 ...Network/CocoaAsyncSocket/GCDAsyncSocket.h → CocoaAsyncSocket/GCDAsyncSocket.h
View file
File renamed without changes.
0 ...Network/CocoaAsyncSocket/GCDAsyncSocket.m → CocoaAsyncSocket/GCDAsyncSocket.m
View file
File renamed without changes.
0 ...work/CocoaAsyncSocket/GCDAsyncUdpSocket.h → CocoaAsyncSocket/GCDAsyncUdpSocket.h
View file
File renamed without changes.
0 ...work/CocoaAsyncSocket/GCDAsyncUdpSocket.m → CocoaAsyncSocket/GCDAsyncUdpSocket.m
View file
File renamed without changes.
0 ...cNetwork/CocoaAsyncSocket/README.markdown → CocoaAsyncSocket/README.markdown
View file
File renamed without changes.

0 comments on commit a032896

Please sign in to comment.