diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 9f55b2c..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -3.0 diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..5e00347 --- /dev/null +++ b/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "SwiftSocket", + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "SwiftSocket", + targets: ["SwiftSocket"]), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "SwiftSocket", + dependencies: ["SwiftSocketC"]), + .target( + name: "SwiftSocketC", + dependencies: []), + .testTarget( + name: "SwiftSocketTests", + dependencies: ["SwiftSocket"]), + ] +) diff --git a/Sources/Result.swift b/Sources/SwiftSocket/Result.swift similarity index 100% rename from Sources/Result.swift rename to Sources/SwiftSocket/Result.swift diff --git a/Sources/Socket.swift b/Sources/SwiftSocket/Socket.swift similarity index 100% rename from Sources/Socket.swift rename to Sources/SwiftSocket/Socket.swift diff --git a/Sources/TCPClient.swift b/Sources/SwiftSocket/TCPSocket/TCPClient.swift similarity index 100% rename from Sources/TCPClient.swift rename to Sources/SwiftSocket/TCPSocket/TCPClient.swift diff --git a/Sources/UDPClient.swift b/Sources/SwiftSocket/UDPSocket/UDPClient.swift similarity index 100% rename from Sources/UDPClient.swift rename to Sources/SwiftSocket/UDPSocket/UDPClient.swift diff --git a/Sources/SwiftSocketC/include/SwiftSocketC.h b/Sources/SwiftSocketC/include/SwiftSocketC.h new file mode 100644 index 0000000..41d098d --- /dev/null +++ b/Sources/SwiftSocketC/include/SwiftSocketC.h @@ -0,0 +1 @@ +@import Foundation; diff --git a/Sources/ytcpsocket.c b/Sources/SwiftSocketC/ytcpsocket.c similarity index 100% rename from Sources/ytcpsocket.c rename to Sources/SwiftSocketC/ytcpsocket.c diff --git a/Sources/yudpsocket.c b/Sources/SwiftSocketC/yudpsocket.c similarity index 99% rename from Sources/yudpsocket.c rename to Sources/SwiftSocketC/yudpsocket.c index e59a725..128d8de 100644 --- a/Sources/yudpsocket.c +++ b/Sources/SwiftSocketC/yudpsocket.c @@ -90,7 +90,7 @@ int yudpsocket_close(int socket_fd) { } //return socket fd -int yudpsocket_client() { +int yudpsocket_client(void) { //create socket int socketfd = socket(AF_INET, SOCK_DGRAM, 0); int reuseon = 1; diff --git a/Sources/Info-tvOS.plist b/Supporting Files/Info-tvOS.plist similarity index 95% rename from Sources/Info-tvOS.plist rename to Supporting Files/Info-tvOS.plist index d25faeb..ffa070f 100755 --- a/Sources/Info-tvOS.plist +++ b/Supporting Files/Info-tvOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/Sources/Info.plist b/Supporting Files/Info.plist similarity index 94% rename from Sources/Info.plist rename to Supporting Files/Info.plist index 0e27f5f..ec0cc7b 100644 --- a/Sources/Info.plist +++ b/Supporting Files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.1 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/Sources/SwiftSocket.h b/Supporting Files/SwiftSocket.h similarity index 93% rename from Sources/SwiftSocket.h rename to Supporting Files/SwiftSocket.h index dc196c5..61fc1d9 100644 --- a/Sources/SwiftSocket.h +++ b/Supporting Files/SwiftSocket.h @@ -7,3 +7,4 @@ FOUNDATION_EXPORT double SwiftSocketVersionNumber; FOUNDATION_EXPORT const unsigned char SwiftSocketVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import +#import diff --git a/SwiftSocket.podspec b/SwiftSocket.podspec index be00bbb..8c72ac0 100644 --- a/SwiftSocket.podspec +++ b/SwiftSocket.podspec @@ -1,7 +1,8 @@ +# coding: utf-8 Pod::Spec.new do |s| s.name = 'SwiftSocket' - s.version = '2.0.2' + s.version = '2.3.1' s.summary = 'A cool framework to work with TCP and UDP sockets' s.description = <<-DESC @@ -15,14 +16,14 @@ Pod::Spec.new do |s| s.author = { 'Dan Shevlyuk' => 'danshevlyuk@icloud.com' } s.social_media_url = 'http://twitter.com/danshevluk' - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '13.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '9.0' s.source = { - :git => 'https://github.com/swiftsocket/SwiftSocket.git', + :git => 'git@github.com:charles-awayup/SwiftSocket.git', :tag => s.version } s.source_files = 'Sources/**/*.{swift,c}' s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5' } - + s.swift_versions = "4.3.2" end diff --git a/SwiftSocket.xcodeproj/project.pbxproj b/SwiftSocket.xcodeproj/project.pbxproj index 0e42045..9998c1c 100644 --- a/SwiftSocket.xcodeproj/project.pbxproj +++ b/SwiftSocket.xcodeproj/project.pbxproj @@ -7,45 +7,35 @@ objects = { /* Begin PBXBuildFile section */ - 3723138F1DCF84CA0042DA87 /* SwiftSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3723138D1DCF84CA0042DA87 /* SwiftSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 372313921DCF84D80042DA87 /* UDPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313901DCF84D80042DA87 /* UDPClient.swift */; }; - 372313931DCF84D80042DA87 /* yudpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 372313911DCF84D80042DA87 /* yudpsocket.c */; }; - 372313961DCF84E30042DA87 /* TCPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313941DCF84E30042DA87 /* TCPClient.swift */; }; - 372313971DCF84E30042DA87 /* ytcpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 372313951DCF84E30042DA87 /* ytcpsocket.c */; }; - 3723139A1DCF84EC0042DA87 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313981DCF84EC0042DA87 /* Result.swift */; }; - 3723139B1DCF84EC0042DA87 /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313991DCF84EC0042DA87 /* Socket.swift */; }; - 3723139C1DCF85270042DA87 /* SwiftSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3723138D1DCF84CA0042DA87 /* SwiftSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 37454ED71E0615FE00800AE5 /* SwiftSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3723138D1DCF84CA0042DA87 /* SwiftSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 37454ED81E06163C00800AE5 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313981DCF84EC0042DA87 /* Result.swift */; }; - 37454ED91E06163C00800AE5 /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313991DCF84EC0042DA87 /* Socket.swift */; }; - 37454EDA1E06163C00800AE5 /* TCPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313941DCF84E30042DA87 /* TCPClient.swift */; }; - 37454EDB1E06163C00800AE5 /* ytcpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 372313951DCF84E30042DA87 /* ytcpsocket.c */; }; - 37454EDC1E06163C00800AE5 /* UDPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313901DCF84D80042DA87 /* UDPClient.swift */; }; - 37454EDD1E06163C00800AE5 /* yudpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 372313911DCF84D80042DA87 /* yudpsocket.c */; }; - 37454EDF1E06163D00800AE5 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313981DCF84EC0042DA87 /* Result.swift */; }; - 37454EE01E06163D00800AE5 /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313991DCF84EC0042DA87 /* Socket.swift */; }; - 37454EE11E06163D00800AE5 /* TCPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313941DCF84E30042DA87 /* TCPClient.swift */; }; - 37454EE21E06163D00800AE5 /* ytcpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 372313951DCF84E30042DA87 /* ytcpsocket.c */; }; - 37454EE31E06163D00800AE5 /* UDPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372313901DCF84D80042DA87 /* UDPClient.swift */; }; - 37454EE41E06163D00800AE5 /* yudpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 372313911DCF84D80042DA87 /* yudpsocket.c */; }; 375C48301DDC4C56008C701D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 375C482F1DDC4C56008C701D /* AppDelegate.swift */; }; 375C48321DDC4C56008C701D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 375C48311DDC4C56008C701D /* ViewController.swift */; }; 375C48351DDC4C56008C701D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 375C48331DDC4C56008C701D /* Main.storyboard */; }; 375C48371DDC4C56008C701D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 375C48361DDC4C56008C701D /* Assets.xcassets */; }; 375C483A1DDC4C56008C701D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 375C48381DDC4C56008C701D /* LaunchScreen.storyboard */; }; + 56AE7B4625CD3F940068681D /* TCPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B3D25CD3F940068681D /* TCPClient.swift */; }; + 56AE7B4725CD3F940068681D /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B3E25CD3F940068681D /* Result.swift */; }; + 56AE7B4825CD3F940068681D /* SwiftSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 56AE7B3F25CD3F940068681D /* SwiftSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 56AE7B4A25CD3F940068681D /* UDPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B4125CD3F940068681D /* UDPClient.swift */; }; + 56AE7B4C25CD3F940068681D /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B4325CD3F940068681D /* Socket.swift */; }; + 56AE7B7025CD40690068681D /* SwiftSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 56AE7B3F25CD3F940068681D /* SwiftSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 56AE7B7525CD406E0068681D /* SwiftSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 56AE7B3F25CD3F940068681D /* SwiftSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 56AE7BAA25CD440B0068681D /* UDPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B4125CD3F940068681D /* UDPClient.swift */; }; + 56AE7BAC25CD440B0068681D /* TCPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B3D25CD3F940068681D /* TCPClient.swift */; }; + 56AE7BAE25CD440B0068681D /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B3E25CD3F940068681D /* Result.swift */; }; + 56AE7BAF25CD440B0068681D /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7B4325CD3F940068681D /* Socket.swift */; }; + 56AE7BD825CD47080068681D /* yudpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7BD625CD47080068681D /* yudpsocket.c */; }; + 56AE7BD925CD47080068681D /* ytcpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7BD725CD47080068681D /* ytcpsocket.c */; }; + 56AE7BDE25CD47100068681D /* yudpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7BD625CD47080068681D /* yudpsocket.c */; }; + 56AE7BE325CD47100068681D /* yudpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7BD625CD47080068681D /* yudpsocket.c */; }; + 56AE7BE825CD47130068681D /* ytcpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7BD725CD47080068681D /* ytcpsocket.c */; }; + 56AE7BED25CD47130068681D /* ytcpsocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 56AE7BD725CD47080068681D /* ytcpsocket.c */; }; + 56AE7C0125CD56630068681D /* SwiftSocketC.h in Headers */ = {isa = PBXBuildFile; fileRef = 56AE7C0025CD56630068681D /* SwiftSocketC.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 56AE7C0225CD56630068681D /* SwiftSocketC.h in Headers */ = {isa = PBXBuildFile; fileRef = 56AE7C0025CD56630068681D /* SwiftSocketC.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 56AE7C0325CD56630068681D /* SwiftSocketC.h in Headers */ = {isa = PBXBuildFile; fileRef = 56AE7C0025CD56630068681D /* SwiftSocketC.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 3723138C1DCF84CA0042DA87 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/Info.plist; sourceTree = SOURCE_ROOT; }; - 3723138D1DCF84CA0042DA87 /* SwiftSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwiftSocket.h; path = Sources/SwiftSocket.h; sourceTree = SOURCE_ROOT; }; - 372313901DCF84D80042DA87 /* UDPClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UDPClient.swift; path = Sources/UDPClient.swift; sourceTree = SOURCE_ROOT; }; - 372313911DCF84D80042DA87 /* yudpsocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = yudpsocket.c; path = Sources/yudpsocket.c; sourceTree = SOURCE_ROOT; }; - 372313941DCF84E30042DA87 /* TCPClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TCPClient.swift; path = Sources/TCPClient.swift; sourceTree = SOURCE_ROOT; }; - 372313951DCF84E30042DA87 /* ytcpsocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ytcpsocket.c; path = Sources/ytcpsocket.c; sourceTree = SOURCE_ROOT; }; - 372313981DCF84EC0042DA87 /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Sources/Result.swift; sourceTree = SOURCE_ROOT; }; - 372313991DCF84EC0042DA87 /* Socket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Socket.swift; path = Sources/Socket.swift; sourceTree = SOURCE_ROOT; }; 37454ECA1E06158200800AE5 /* SwiftSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 37454EE81E0617F300800AE5 /* Info-tvOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "Sources/Info-tvOS.plist"; sourceTree = SOURCE_ROOT; }; 375C482D1DDC4C56008C701D /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 375C482F1DDC4C56008C701D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 375C48311DDC4C56008C701D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -55,6 +45,16 @@ 375C483B1DDC4C56008C701D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 377DAA691DCDE40200009697 /* SwiftSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 377DAA761DCDE45D00009697 /* SwiftSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 56AE7B3D25CD3F940068681D /* TCPClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TCPClient.swift; sourceTree = ""; }; + 56AE7B3E25CD3F940068681D /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = ""; }; + 56AE7B3F25CD3F940068681D /* SwiftSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftSocket.h; sourceTree = ""; }; + 56AE7B4025CD3F940068681D /* Info-tvOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = ""; }; + 56AE7B4125CD3F940068681D /* UDPClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UDPClient.swift; sourceTree = ""; }; + 56AE7B4225CD3F940068681D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 56AE7B4325CD3F940068681D /* Socket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Socket.swift; sourceTree = ""; }; + 56AE7BD625CD47080068681D /* yudpsocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = yudpsocket.c; sourceTree = ""; }; + 56AE7BD725CD47080068681D /* ytcpsocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ytcpsocket.c; sourceTree = ""; }; + 56AE7C0025CD56630068681D /* SwiftSocketC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftSocketC.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -89,24 +89,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 375BC51D1DCDE86B006AD8F6 /* TCPSocket */ = { - isa = PBXGroup; - children = ( - 372313941DCF84E30042DA87 /* TCPClient.swift */, - 372313951DCF84E30042DA87 /* ytcpsocket.c */, - ); - name = TCPSocket; - sourceTree = ""; - }; - 375BC51E1DCDE878006AD8F6 /* UDPSocket */ = { - isa = PBXGroup; - children = ( - 372313901DCF84D80042DA87 /* UDPClient.swift */, - 372313911DCF84D80042DA87 /* yudpsocket.c */, - ); - name = UDPSocket; - sourceTree = ""; - }; 375C482E1DDC4C56008C701D /* iOS Example */ = { isa = PBXGroup; children = ( @@ -120,21 +102,11 @@ path = "iOS Example"; sourceTree = ""; }; - 377DAA6A1DCDE40200009697 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 3723138C1DCF84CA0042DA87 /* Info.plist */, - 37454EE81E0617F300800AE5 /* Info-tvOS.plist */, - 3723138D1DCF84CA0042DA87 /* SwiftSocket.h */, - ); - name = "Supporting Files"; - path = "../SwiftSocket iOS"; - sourceTree = ""; - }; 5518C82619A3290F0049DC22 = { isa = PBXGroup; children = ( - 5518C83119A329100049DC22 /* Source */, + 56AE7B5325CD3FDA0068681D /* Supporting Files */, + 56AE7B3925CD3F940068681D /* Sources */, 375C482E1DDC4C56008C701D /* iOS Example */, 5518C83019A329100049DC22 /* Products */, ); @@ -151,17 +123,68 @@ name = Products; sourceTree = ""; }; - 5518C83119A329100049DC22 /* Source */ = { + 56AE7B3925CD3F940068681D /* Sources */ = { + isa = PBXGroup; + children = ( + 56AE7BD525CD47080068681D /* SwiftSocketC */, + 56AE7B3A25CD3F940068681D /* SwiftSocket */, + ); + path = Sources; + sourceTree = ""; + }; + 56AE7B3A25CD3F940068681D /* SwiftSocket */ = { + isa = PBXGroup; + children = ( + 56AE7B5225CD3FA10068681D /* UDPSocket */, + 56AE7B5125CD3F990068681D /* TCPSocket */, + 56AE7B3E25CD3F940068681D /* Result.swift */, + 56AE7B4325CD3F940068681D /* Socket.swift */, + ); + path = SwiftSocket; + sourceTree = ""; + }; + 56AE7B5125CD3F990068681D /* TCPSocket */ = { + isa = PBXGroup; + children = ( + 56AE7B3D25CD3F940068681D /* TCPClient.swift */, + ); + path = TCPSocket; + sourceTree = ""; + }; + 56AE7B5225CD3FA10068681D /* UDPSocket */ = { + isa = PBXGroup; + children = ( + 56AE7B4125CD3F940068681D /* UDPClient.swift */, + ); + path = UDPSocket; + sourceTree = ""; + }; + 56AE7B5325CD3FDA0068681D /* Supporting Files */ = { isa = PBXGroup; children = ( - 372313981DCF84EC0042DA87 /* Result.swift */, - 372313991DCF84EC0042DA87 /* Socket.swift */, - 375BC51D1DCDE86B006AD8F6 /* TCPSocket */, - 375BC51E1DCDE878006AD8F6 /* UDPSocket */, - 377DAA6A1DCDE40200009697 /* Supporting Files */, - ); - name = Source; - path = SwiftC; + 56AE7B3F25CD3F940068681D /* SwiftSocket.h */, + 56AE7B4025CD3F940068681D /* Info-tvOS.plist */, + 56AE7B4225CD3F940068681D /* Info.plist */, + ); + path = "Supporting Files"; + sourceTree = ""; + }; + 56AE7BD525CD47080068681D /* SwiftSocketC */ = { + isa = PBXGroup; + children = ( + 56AE7BFF25CD56630068681D /* include */, + 56AE7BD625CD47080068681D /* yudpsocket.c */, + 56AE7BD725CD47080068681D /* ytcpsocket.c */, + ); + path = SwiftSocketC; + sourceTree = ""; + }; + 56AE7BFF25CD56630068681D /* include */ = { + isa = PBXGroup; + children = ( + 56AE7C0025CD56630068681D /* SwiftSocketC.h */, + ); + path = include; sourceTree = ""; }; /* End PBXGroup section */ @@ -171,7 +194,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 37454ED71E0615FE00800AE5 /* SwiftSocket.h in Headers */, + 56AE7B7525CD406E0068681D /* SwiftSocket.h in Headers */, + 56AE7C0325CD56630068681D /* SwiftSocketC.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -179,7 +203,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3723138F1DCF84CA0042DA87 /* SwiftSocket.h in Headers */, + 56AE7B4825CD3F940068681D /* SwiftSocket.h in Headers */, + 56AE7C0125CD56630068681D /* SwiftSocketC.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -187,7 +212,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3723139C1DCF85270042DA87 /* SwiftSocket.h in Headers */, + 56AE7B7025CD40690068681D /* SwiftSocket.h in Headers */, + 56AE7C0225CD56630068681D /* SwiftSocketC.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -273,7 +299,7 @@ attributes = { LastSwiftMigration = 0710; LastSwiftUpdateCheck = 0810; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = swift; TargetAttributes = { 37454EC91E06158200800AE5 = { @@ -357,12 +383,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 37454EE31E06163D00800AE5 /* UDPClient.swift in Sources */, - 37454EE01E06163D00800AE5 /* Socket.swift in Sources */, - 37454EE41E06163D00800AE5 /* yudpsocket.c in Sources */, - 37454EDF1E06163D00800AE5 /* Result.swift in Sources */, - 37454EE21E06163D00800AE5 /* ytcpsocket.c in Sources */, - 37454EE11E06163D00800AE5 /* TCPClient.swift in Sources */, + 56AE7BED25CD47130068681D /* ytcpsocket.c in Sources */, + 56AE7BE325CD47100068681D /* yudpsocket.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -379,12 +401,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 372313931DCF84D80042DA87 /* yudpsocket.c in Sources */, - 3723139A1DCF84EC0042DA87 /* Result.swift in Sources */, - 3723139B1DCF84EC0042DA87 /* Socket.swift in Sources */, - 372313921DCF84D80042DA87 /* UDPClient.swift in Sources */, - 372313971DCF84E30042DA87 /* ytcpsocket.c in Sources */, - 372313961DCF84E30042DA87 /* TCPClient.swift in Sources */, + 56AE7B4625CD3F940068681D /* TCPClient.swift in Sources */, + 56AE7BD825CD47080068681D /* yudpsocket.c in Sources */, + 56AE7B4A25CD3F940068681D /* UDPClient.swift in Sources */, + 56AE7B4725CD3F940068681D /* Result.swift in Sources */, + 56AE7BD925CD47080068681D /* ytcpsocket.c in Sources */, + 56AE7B4C25CD3F940068681D /* Socket.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -392,12 +414,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 37454EDC1E06163C00800AE5 /* UDPClient.swift in Sources */, - 37454ED91E06163C00800AE5 /* Socket.swift in Sources */, - 37454EDD1E06163C00800AE5 /* yudpsocket.c in Sources */, - 37454ED81E06163C00800AE5 /* Result.swift in Sources */, - 37454EDB1E06163C00800AE5 /* ytcpsocket.c in Sources */, - 37454EDA1E06163C00800AE5 /* TCPClient.swift in Sources */, + 56AE7BAA25CD440B0068681D /* UDPClient.swift in Sources */, + 56AE7BDE25CD47100068681D /* yudpsocket.c in Sources */, + 56AE7BAC25CD440B0068681D /* TCPClient.swift in Sources */, + 56AE7BAE25CD440B0068681D /* Result.swift in Sources */, + 56AE7BE825CD47130068681D /* ytcpsocket.c in Sources */, + 56AE7BAF25CD440B0068681D /* Socket.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -438,10 +460,11 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Sources/Info-tvOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.swiftsocket.SwiftSocket; PRODUCT_NAME = SwiftSocket; SDKROOT = appletvos; @@ -470,10 +493,11 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Sources/Info-tvOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.swiftsocket.SwiftSocket; PRODUCT_NAME = SwiftSocket; SDKROOT = appletvos; @@ -498,8 +522,9 @@ DEBUG_INFORMATION_FORMAT = dwarf; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "iOS Example/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = "com.danshevluk.iOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -521,8 +546,9 @@ COPY_PHASE_STRIP = NO; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "iOS Example/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = "com.danshevluk.iOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -551,10 +577,11 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.swiftsocket.SwiftSocket; PRODUCT_NAME = SwiftSocket; SDKROOT = iphoneos; @@ -586,10 +613,11 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.swiftsocket.SwiftSocket; PRODUCT_NAME = SwiftSocket; SDKROOT = iphoneos; @@ -616,16 +644,17 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.swiftsocket.SwiftSocket; PRODUCT_NAME = SwiftSocket; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -642,16 +671,17 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.swiftsocket.SwiftSocket; PRODUCT_NAME = SwiftSocket; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -679,6 +709,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -702,7 +733,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -736,6 +767,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -752,7 +784,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = ""; diff --git a/SwiftSocket.xcodeproj/xcshareddata/xcschemes/SwiftSocket iOS.xcscheme b/SwiftSocket.xcodeproj/xcshareddata/xcschemes/SwiftSocket iOS.xcscheme index f6d73a0..ebd1cca 100644 --- a/SwiftSocket.xcodeproj/xcshareddata/xcschemes/SwiftSocket iOS.xcscheme +++ b/SwiftSocket.xcodeproj/xcshareddata/xcschemes/SwiftSocket iOS.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - - - - - [XCTestCaseEntry] { + return [ + testCase(SwiftSocketTests.allTests), + ] +} +#endif diff --git a/iOS Example/Info.plist b/iOS Example/Info.plist index d052473..214653b 100644 --- a/iOS Example/Info.plist +++ b/iOS Example/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion 1 LSRequiresIPhoneOS