Skip to content
This repository has been archived by the owner on Apr 19, 2021. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@joeljfischer
joeljfischer committed Nov 24, 2015
2 parents f7a6f2e + 11b5c7e commit a99d269
Show file tree
Hide file tree
Showing 10 changed files with 413 additions and 165 deletions.
4 changes: 3 additions & 1 deletion supersocket.podspec → SuperSocket.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ Pod::Spec.new do |spec|
spec.summary = 'Asynchronous socket networking library forked from CocoaAsyncSocket'
spec.source = { :git => 'https://github.com/livio/supersocket.git', :tag => spec.version.to_s }
spec.source_files = 'SuperSocket/*.{h,m}'
end
spec.ios.deployment_target = '8.0'
spec.osx.deployment_target = '10.9'
end
160 changes: 154 additions & 6 deletions SuperSocket.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,25 @@
5D77F9C81B55A13A0013F9A7 /* STCPWritePacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9C61B55A13A0013F9A7 /* STCPWritePacket.m */; };
5D77F9CF1B55A8B30013F9A7 /* STCPSocketDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9CE1B55A8B30013F9A7 /* STCPSocketDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
5D77F9D21B55AAD80013F9A7 /* SUDPSocketDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9D11B55AAD80013F9A7 /* SUDPSocketDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
BF0B33451C03F03E00633F54 /* STCPSocketPreBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9BD1B55A0CC0013F9A7 /* STCPSocketPreBuffer.h */; };
BF0B33461C03F03E00633F54 /* STCPReadPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9C11B55A10B0013F9A7 /* STCPReadPacket.h */; };
BF0B33471C03F03E00633F54 /* STCPWritePacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9C51B55A13A0013F9A7 /* STCPWritePacket.h */; };
BF0B33481C03F03E00633F54 /* STCPSpecialPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D1DC7F61B754B6100236EE6 /* STCPSpecialPacket.h */; };
BF0B33491C03F03E00633F54 /* SUDPSendPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9B41B559FF90013F9A7 /* SUDPSendPacket.h */; };
BF0B334A1C03F03E00633F54 /* SUDPSpecialPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9B81B55A0690013F9A7 /* SUDPSpecialPacket.h */; };
BFD94EF11BFFD93E004F0576 /* SuperSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9991B5597510013F9A7 /* SuperSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
BFFBFEAE1BD990D80004CC87 /* STCPSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9961B5597510013F9A7 /* STCPSocket.m */; };
BFFBFEAF1BD990D80004CC87 /* STCPSocketPreBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9BE1B55A0CC0013F9A7 /* STCPSocketPreBuffer.m */; };
BFFBFEB01BD990D80004CC87 /* STCPReadPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9C21B55A10B0013F9A7 /* STCPReadPacket.m */; };
BFFBFEB11BD990D80004CC87 /* STCPWritePacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9C61B55A13A0013F9A7 /* STCPWritePacket.m */; };
BFFBFEB21BD990D80004CC87 /* STCPSpecialPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D1DC7F71B754B6100236EE6 /* STCPSpecialPacket.m */; };
BFFBFEB31BD990D80004CC87 /* SUDPSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9981B5597510013F9A7 /* SUDPSocket.m */; };
BFFBFEB41BD990D80004CC87 /* SUDPSendPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9B51B559FF90013F9A7 /* SUDPSendPacket.m */; };
BFFBFEB51BD990D80004CC87 /* SUDPSpecialPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D77F9B91B55A0690013F9A7 /* SUDPSpecialPacket.m */; };
BFFBFEB61BD991800004CC87 /* STCPSocketDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9CE1B55A8B30013F9A7 /* STCPSocketDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
BFFBFEB71BD991800004CC87 /* STCPSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9951B5597510013F9A7 /* STCPSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
BFFBFEB81BD991800004CC87 /* SUDPSocketDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9D11B55AAD80013F9A7 /* SUDPSocketDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
BFFBFEB91BD991800004CC87 /* SUDPSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D77F9971B5597510013F9A7 /* SUDPSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -65,6 +84,7 @@
5D77F9C61B55A13A0013F9A7 /* STCPWritePacket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = STCPWritePacket.m; path = SuperSocket/STCPWritePacket.m; sourceTree = SOURCE_ROOT; };
5D77F9CE1B55A8B30013F9A7 /* STCPSocketDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STCPSocketDelegate.h; path = SuperSocket/STCPSocketDelegate.h; sourceTree = SOURCE_ROOT; };
5D77F9D11B55AAD80013F9A7 /* SUDPSocketDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUDPSocketDelegate.h; path = SuperSocket/SUDPSocketDelegate.h; sourceTree = SOURCE_ROOT; };
BFFBFEA61BD98FD70004CC87 /* SuperSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SuperSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -83,6 +103,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BFFBFEA21BD98FD70004CC87 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand All @@ -100,6 +127,7 @@
children = (
5D48330A1A9D074D00252386 /* SuperSocket.framework */,
5D77F9A81B55992D0013F9A7 /* SuperSocketTests.xctest */,
BFFBFEA61BD98FD70004CC87 /* SuperSocket.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -202,12 +230,30 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BFFBFEA31BD98FD70004CC87 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
BFD94EF11BFFD93E004F0576 /* SuperSocket.h in Headers */,
BFFBFEB61BD991800004CC87 /* STCPSocketDelegate.h in Headers */,
BFFBFEB81BD991800004CC87 /* SUDPSocketDelegate.h in Headers */,
BFFBFEB91BD991800004CC87 /* SUDPSocket.h in Headers */,
BFFBFEB71BD991800004CC87 /* STCPSocket.h in Headers */,
BF0B33451C03F03E00633F54 /* STCPSocketPreBuffer.h in Headers */,
BF0B33461C03F03E00633F54 /* STCPReadPacket.h in Headers */,
BF0B33471C03F03E00633F54 /* STCPWritePacket.h in Headers */,
BF0B33481C03F03E00633F54 /* STCPSpecialPacket.h in Headers */,
BF0B33491C03F03E00633F54 /* SUDPSendPacket.h in Headers */,
BF0B334A1C03F03E00633F54 /* SUDPSpecialPacket.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
5D4833091A9D074D00252386 /* SuperSocket */ = {
5D4833091A9D074D00252386 /* SuperSocket iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5D4833201A9D074D00252386 /* Build configuration list for PBXNativeTarget "SuperSocket" */;
buildConfigurationList = 5D4833201A9D074D00252386 /* Build configuration list for PBXNativeTarget "SuperSocket iOS" */;
buildPhases = (
5D4833051A9D074D00252386 /* Sources */,
5D4833061A9D074D00252386 /* Frameworks */,
Expand All @@ -218,7 +264,7 @@
);
dependencies = (
);
name = SuperSocket;
name = "SuperSocket iOS";
productName = CocoaAsyncSocket;
productReference = 5D48330A1A9D074D00252386 /* SuperSocket.framework */;
productType = "com.apple.product-type.framework";
Expand All @@ -241,6 +287,24 @@
productReference = 5D77F9A81B55992D0013F9A7 /* SuperSocketTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
BFFBFEA51BD98FD70004CC87 /* SuperSocket Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = BFFBFEAB1BD98FD70004CC87 /* Build configuration list for PBXNativeTarget "SuperSocket Mac" */;
buildPhases = (
BFFBFEA11BD98FD70004CC87 /* Sources */,
BFFBFEA21BD98FD70004CC87 /* Frameworks */,
BFFBFEA31BD98FD70004CC87 /* Headers */,
BFFBFEA41BD98FD70004CC87 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "SuperSocket Mac";
productName = SuperSocket;
productReference = BFFBFEA61BD98FD70004CC87 /* SuperSocket.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -256,6 +320,9 @@
5D77F9A71B55992D0013F9A7 = {
CreatedOnToolsVersion = 7.0;
};
BFFBFEA51BD98FD70004CC87 = {
CreatedOnToolsVersion = 7.1;
};
};
};
buildConfigurationList = 5D4833041A9D074D00252386 /* Build configuration list for PBXProject "SuperSocket" */;
Expand All @@ -270,7 +337,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
5D4833091A9D074D00252386 /* SuperSocket */,
5D4833091A9D074D00252386 /* SuperSocket iOS */,
BFFBFEA51BD98FD70004CC87 /* SuperSocket Mac */,
5D77F9A71B55992D0013F9A7 /* SuperSocketTests */,
);
};
Expand All @@ -291,6 +359,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BFFBFEA41BD98FD70004CC87 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -317,12 +392,27 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BFFBFEA11BD98FD70004CC87 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BFFBFEB01BD990D80004CC87 /* STCPReadPacket.m in Sources */,
BFFBFEB41BD990D80004CC87 /* SUDPSendPacket.m in Sources */,
BFFBFEB11BD990D80004CC87 /* STCPWritePacket.m in Sources */,
BFFBFEB51BD990D80004CC87 /* SUDPSpecialPacket.m in Sources */,
BFFBFEAF1BD990D80004CC87 /* STCPSocketPreBuffer.m in Sources */,
BFFBFEAE1BD990D80004CC87 /* STCPSocket.m in Sources */,
BFFBFEB31BD990D80004CC87 /* SUDPSocket.m in Sources */,
BFFBFEB21BD990D80004CC87 /* STCPSpecialPacket.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
5D77F9AF1B55992D0013F9A7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 5D4833091A9D074D00252386 /* SuperSocket */;
target = 5D4833091A9D074D00252386 /* SuperSocket iOS */;
targetProxy = 5D77F9AE1B55992D0013F9A7 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -417,6 +507,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_STATIC_ANALYZER_MODE = deep;
COPY_PHASE_STRIP = NO;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -436,6 +527,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_STATIC_ANALYZER_MODE = deep;
COPY_PHASE_STRIP = NO;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down Expand Up @@ -478,6 +570,53 @@
};
name = Release;
};
BFFBFEAC1BD98FD70004CC87 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = SuperSocket/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = com.livio.SuperSocket;
PRODUCT_NAME = SuperSocket;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
};
BFFBFEAD1BD98FD70004CC87 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = SuperSocket/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = com.livio.SuperSocket;
PRODUCT_NAME = SuperSocket;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -490,7 +629,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
5D4833201A9D074D00252386 /* Build configuration list for PBXNativeTarget "SuperSocket" */ = {
5D4833201A9D074D00252386 /* Build configuration list for PBXNativeTarget "SuperSocket iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D4833211A9D074D00252386 /* Debug */,
Expand All @@ -508,6 +647,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
BFFBFEAB1BD98FD70004CC87 /* Build configuration list for PBXNativeTarget "SuperSocket Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BFFBFEAC1BD98FD70004CC87 /* Debug */,
BFFBFEAD1BD98FD70004CC87 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 5D4833011A9D074D00252386 /* Project object */;
Expand Down
80 changes: 80 additions & 0 deletions SuperSocket.xcodeproj/xcshareddata/xcschemes/SuperSocket Mac.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFFBFEA51BD98FD70004CC87"
BuildableName = "SuperSocket.framework"
BlueprintName = "SuperSocket Mac"
ReferencedContainer = "container:SuperSocket.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFFBFEA51BD98FD70004CC87"
BuildableName = "SuperSocket.framework"
BlueprintName = "SuperSocket Mac"
ReferencedContainer = "container:SuperSocket.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFFBFEA51BD98FD70004CC87"
BuildableName = "SuperSocket.framework"
BlueprintName = "SuperSocket Mac"
ReferencedContainer = "container:SuperSocket.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit a99d269

Please sign in to comment.