From fbe2243fc691a0c0366bff596893007759b258fb Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Mon, 17 Feb 2020 19:56:38 -0800 Subject: [PATCH 1/6] Fixing warnings --- .travis.yml | 2 +- CocoaAsyncSocket.podspec | 2 +- CocoaAsyncSocket.xcodeproj/project.pbxproj | 47 ++++++++--- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ .../xcschemes/Mac Framework.xcscheme | 24 +++--- .../xcschemes/iOS Framework.xcscheme | 24 +++--- .../xcschemes/tvOS Framework.xcscheme | 6 +- Tests/Gemfile => Gemfile | 2 +- Gemfile.lock | 83 +++++++++++++++++++ README.markdown | 2 +- Source/GCD/GCDAsyncUdpSocket.m | 2 +- .../project.pbxproj | 54 ++++++++---- Tests/Gemfile.lock | 76 ----------------- .../project.pbxproj | 57 ++++++------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ .../CocoaAsyncSocketTestsMac.xcscheme | 24 +++--- Tests/Mac/Podfile | 2 +- Tests/Mac/Podfile.lock | 10 +-- Tests/Shared/Swift/TestServer.swift | 6 +- Tests/Shared/Swift/TestSocket.swift | 7 +- .../project.pbxproj | 57 ++++++------- .../CocoaAsyncSocketTestsiOS.xcscheme | 24 +++--- Tests/iOS/Podfile | 2 +- Tests/iOS/Podfile.lock | 10 +-- Tests/test-all.sh | 2 +- 25 files changed, 295 insertions(+), 246 deletions(-) create mode 100644 CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename Tests/Gemfile => Gemfile (53%) create mode 100644 Gemfile.lock delete mode 100644 Tests/Gemfile.lock create mode 100644 Tests/Mac/CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist mode change 100644 => 100755 Tests/test-all.sh diff --git a/.travis.yml b/.travis.yml index fbd7dc15..ba406991 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - cd ../ script: - - export IOS_VERSION="11.2" # waiting for xcode9.3 on Travis + - export IOS_VERSION="13.3" - bash Tests/test-all.sh - swift build - swift test diff --git a/CocoaAsyncSocket.podspec b/CocoaAsyncSocket.podspec index 1034f472..cc8111f0 100644 --- a/CocoaAsyncSocket.podspec +++ b/CocoaAsyncSocket.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'CocoaAsyncSocket' - s.version = '7.6.3' + s.version = '7.6.4' s.license = { :type => 'public domain', :text => <<-LICENSE Public Domain License diff --git a/CocoaAsyncSocket.xcodeproj/project.pbxproj b/CocoaAsyncSocket.xcodeproj/project.pbxproj index 3dc2be20..6fc0bb48 100644 --- a/CocoaAsyncSocket.xcodeproj/project.pbxproj +++ b/CocoaAsyncSocket.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -197,7 +197,7 @@ 6CD990071B77868C0011A685 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1130; ORGANIZATIONNAME = "Robbie Hanson"; TargetAttributes = { 6CD9900F1B77868C0011A685 = { @@ -215,11 +215,12 @@ }; }; buildConfigurationList = 6CD9900A1B77868C0011A685 /* Build configuration list for PBXProject "CocoaAsyncSocket" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = English; + compatibilityVersion = "Xcode 11.0"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 6CD990061B77868C0011A685; productRefGroup = 6CD990111B77868C0011A685 /* Products */; @@ -292,6 +293,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; @@ -364,6 +366,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; @@ -437,7 +440,11 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.robbiehanson.CocoaAsyncSocket; PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; @@ -455,7 +462,11 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.robbiehanson.CocoaAsyncSocket; PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; @@ -473,7 +484,11 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.robbiehanson.CocoaAsyncSocket; PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = appletvos; @@ -494,7 +509,11 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.robbiehanson.CocoaAsyncSocket; PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = appletvos; @@ -521,7 +540,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = com.robbiehanson.CocoaAsyncSocket; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -543,7 +566,11 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = com.robbiehanson.CocoaAsyncSocket; PRODUCT_NAME = "$(PROJECT_NAME)"; diff --git a/CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/Mac Framework.xcscheme b/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/Mac Framework.xcscheme index 17c98451..e408d6c7 100644 --- a/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/Mac Framework.xcscheme +++ b/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/Mac Framework.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -53,17 +62,6 @@ - - - - - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - - - - - 1.4.0" +gem 'cocoapods' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..f173352f --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,83 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.2) + activesupport (4.2.11.1) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + algoliasearch (1.27.1) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) + cocoapods (1.8.4) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.8.4) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.6.6) + nap (~> 1.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.11.1, < 2.0) + cocoapods-core (1.8.4) + activesupport (>= 4.0.2, < 6) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.3.0) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.4.1) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.1.6) + escape (0.0.4) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.3.0) + minitest (5.14.0) + molinillo (0.6.6) + nanaimo (0.2.6) + nap (1.1.0) + netrc (0.11.0) + ruby-macho (1.4.0) + thread_safe (0.3.6) + tzinfo (1.2.6) + thread_safe (~> 0.1) + xcodeproj (1.15.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods + +BUNDLED WITH + 2.0.2 diff --git a/README.markdown b/README.markdown index d2347caf..155a8dab 100644 --- a/README.markdown +++ b/README.markdown @@ -36,7 +36,7 @@ Select the correct framework(s) and drag it into your project. Simply add the package dependency to your Package.swift and depend on "CocoaAsyncSocket" in the necessary targets: ```swift dependencies: [ - .package(url: "https://github.com/robbiehanson/CocoaAsyncSocket", from: "7.6.3") + .package(url: "https://github.com/robbiehanson/CocoaAsyncSocket", from: "7.6.4") ] ``` diff --git a/Source/GCD/GCDAsyncUdpSocket.m b/Source/GCD/GCDAsyncUdpSocket.m index 900ea10e..e2979913 100755 --- a/Source/GCD/GCDAsyncUdpSocket.m +++ b/Source/GCD/GCDAsyncUdpSocket.m @@ -253,7 +253,7 @@ + (uint16_t)portFromSockaddr6:(const struct sockaddr_in6 *)pSockaddr6; #if TARGET_OS_IPHONE // Forward declaration -+ (void)listenerThread; ++ (void)listenerThread:(id)unused; #endif @end diff --git a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj index 2a597192..8c5b4434 100644 --- a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj +++ b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -286,20 +286,21 @@ LastUpgradeCheck = 0930; TargetAttributes = { D9486AE71E62BA66002FE3B3 = { - LastSwiftMigration = 0910; + LastSwiftMigration = 1130; }; D9BC0D8C1A0458EF0059D906 = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0810; + LastSwiftMigration = 1130; }; }; }; buildConfigurationList = D9BC0D781A0457800059D906 /* Build configuration list for PBXProject "CocoaAsyncSocketTests" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = English; + compatibilityVersion = "Xcode 11.0"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = D9BC0D741A0457800059D906; productRefGroup = D9BC0D801A0457F40059D906 /* Products */; @@ -471,7 +472,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = ../Shared/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; @@ -515,7 +520,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = ../Shared/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; @@ -563,7 +572,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = ../Shared/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; @@ -607,7 +620,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = ../Shared/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; @@ -648,7 +665,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -682,8 +699,9 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -726,7 +744,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = ../Shared/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; @@ -770,7 +792,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = ../Shared/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; diff --git a/Tests/Gemfile.lock b/Tests/Gemfile.lock deleted file mode 100644 index 12ad113b..00000000 --- a/Tests/Gemfile.lock +++ /dev/null @@ -1,76 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (2.3.6) - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - atomos (0.1.2) - claide (1.0.2) - cocoapods (1.2.1) - activesupport (>= 4.0.2, < 5) - claide (>= 1.0.1, < 2.0) - cocoapods-core (= 1.2.1) - cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.3, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.2.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (~> 2.0.1) - gh_inspector (~> 1.0) - molinillo (~> 0.5.7) - nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.4.4, < 2.0) - cocoapods-core (1.2.1) - activesupport (>= 4.0.2, < 5) - fuzzy_match (~> 2.0.4) - nap (~> 1.0) - cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.1.3) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) - cocoapods-trunk (1.3.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.1.0) - colored2 (3.1.2) - concurrent-ruby (1.0.5) - escape (0.0.4) - fourflusher (2.0.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.2) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - minitest (5.11.3) - molinillo (0.5.7) - nanaimo (0.2.3) - nap (1.1.0) - netrc (0.11.0) - ruby-macho (1.1.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - xcodeproj (1.5.6) - CFPropertyList (~> 2.3.3) - atomos (~> 0.1.2) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.2.3) - -PLATFORMS - ruby - -DEPENDENCIES - cocoapods (~> 1.2.1) - -BUNDLED WITH - 1.15.4 diff --git a/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj b/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj index 31270ff4..83de13dd 100644 --- a/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj +++ b/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -152,7 +152,6 @@ D9BC0D8A1A0458EF0059D906 /* Frameworks */, D9BC0D8B1A0458EF0059D906 /* Resources */, AA94AAA5A64A884AD2E4A6DD /* [CP] Embed Pods Frameworks */, - ADC6CEFA3FD08AEA679AEBA7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -170,20 +169,21 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1130; TargetAttributes = { D9BC0D8C1A0458EF0059D906 = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0810; + LastSwiftMigration = 1130; }; }; }; buildConfigurationList = D9BC0D781A0457800059D906 /* Build configuration list for PBXProject "CocoaAsyncSocket" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + compatibilityVersion = "Xcode 11.0"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = D9BC0D741A0457800059D906; productRefGroup = D9BC0D801A0457F40059D906 /* Products */; @@ -230,32 +230,16 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-CocoaAsyncSocketTestsMac/Pods-CocoaAsyncSocketTestsMac-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-CocoaAsyncSocketTestsMac/Pods-CocoaAsyncSocketTestsMac-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CocoaAsyncSocketTestsMac/Pods-CocoaAsyncSocketTestsMac-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - ADC6CEFA3FD08AEA679AEBA7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-CocoaAsyncSocketTestsMac/Pods-CocoaAsyncSocketTestsMac-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CocoaAsyncSocketTestsMac/Pods-CocoaAsyncSocketTestsMac-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CocoaAsyncSocketTestsMac/Pods-CocoaAsyncSocketTestsMac-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -281,6 +265,7 @@ D9BC0D791A0457800059D906 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -317,6 +302,7 @@ D9BC0D7A1A0457800059D906 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -344,7 +330,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 4.0; }; name = Release; @@ -389,13 +376,18 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -434,12 +426,17 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme b/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme index ef51cdc0..c0f29680 100644 --- a/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme +++ b/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -39,17 +48,6 @@ - - - - - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - Date: Mon, 17 Feb 2020 20:28:15 -0800 Subject: [PATCH 2/6] Convert to Xcode 11 Test Plans --- .gitignore | 3 ++ .../CocoaAsyncSocketTests (iOS).xctestplan | 29 +++++++++++++++++++ .../CocoaAsyncSocketTests (macOS).xctestplan | 29 +++++++++++++++++++ .../CocoaAsyncSocketTests (tvOS).xctestplan | 29 +++++++++++++++++++ .../project.pbxproj | 6 ++++ .../CocoaAsyncSocketTests (iOS).xcscheme | 21 +++++--------- .../CocoaAsyncSocketTests (macOS).xcscheme | 21 +++++--------- .../CocoaAsyncSocketTests (tvOS).xcscheme | 21 +++++--------- .../project.pbxproj | 2 ++ .../CocoaAsyncSocketTestsMac.xcscheme | 17 +++++------ Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan | 29 +++++++++++++++++++ .../project.pbxproj | 2 ++ .../CocoaAsyncSocketTestsiOS.xcscheme | 17 +++++------ Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan | 29 +++++++++++++++++++ 14 files changed, 193 insertions(+), 62 deletions(-) create mode 100644 Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan create mode 100644 Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan create mode 100644 Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan create mode 100644 Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan create mode 100644 Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan diff --git a/.gitignore b/.gitignore index 25a86413..eee0b818 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ build/ DerivedData +## Swift Package Manager +.swiftpm/ + ## Various settings *.pbxuser !default.pbxuser diff --git a/Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan b/Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan new file mode 100644 index 00000000..31ef4573 --- /dev/null +++ b/Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan @@ -0,0 +1,29 @@ +{ + "configurations" : [ + { + "id" : "6F9A4B26-F3B5-4EF1-8DED-DF070B3D3C07", + "name" : "Configuration 1", + "options" : { + + } + } + ], + "defaultOptions" : { + "codeCoverage" : false, + "targetForVariableExpansion" : { + "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", + "identifier" : "D9486AE71E62BA66002FE3B3", + "name" : "CocoaAsyncSocketTests (iOS)" + } + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", + "identifier" : "D9486AE71E62BA66002FE3B3", + "name" : "CocoaAsyncSocketTests (iOS)" + } + } + ], + "version" : 1 +} diff --git a/Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan b/Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan new file mode 100644 index 00000000..d4832cdb --- /dev/null +++ b/Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan @@ -0,0 +1,29 @@ +{ + "configurations" : [ + { + "id" : "17DE08FC-4577-407F-8B0B-3251F404497A", + "name" : "Configuration 1", + "options" : { + + } + } + ], + "defaultOptions" : { + "codeCoverage" : false, + "targetForVariableExpansion" : { + "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", + "identifier" : "D9BC0D8C1A0458EF0059D906", + "name" : "CocoaAsyncSocketTests (macOS)" + } + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", + "identifier" : "D9BC0D8C1A0458EF0059D906", + "name" : "CocoaAsyncSocketTests (macOS)" + } + } + ], + "version" : 1 +} diff --git a/Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan b/Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan new file mode 100644 index 00000000..3ff5c173 --- /dev/null +++ b/Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan @@ -0,0 +1,29 @@ +{ + "configurations" : [ + { + "id" : "C61183F8-7DFD-424D-9790-E803AA51DE9A", + "name" : "Configuration 1", + "options" : { + + } + } + ], + "defaultOptions" : { + "codeCoverage" : false, + "targetForVariableExpansion" : { + "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", + "identifier" : "D9486AF91E62BB3D002FE3B3", + "name" : "CocoaAsyncSocketTests (tvOS)" + } + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", + "identifier" : "D9486AF91E62BB3D002FE3B3", + "name" : "CocoaAsyncSocketTests (tvOS)" + } + } + ], + "version" : 1 +} diff --git a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj index 8c5b4434..f3ae2f43 100644 --- a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj +++ b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj @@ -88,6 +88,9 @@ 8710851B23FAA4E00004F896 /* SecureSocketServer.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = SecureSocketServer.p12; sourceTree = ""; }; 8710851C23FAA4E00004F896 /* TestSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSocket.swift; sourceTree = ""; }; 8710851D23FAA4E00004F896 /* GCDAsyncSocketReadTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GCDAsyncSocketReadTests.swift; sourceTree = ""; }; + D92A3B8B23FB9B250089F6C3 /* CocoaAsyncSocketTests (macOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (macOS).xctestplan"; sourceTree = ""; }; + D92A3B8C23FB9B680089F6C3 /* CocoaAsyncSocketTests (iOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (iOS).xctestplan"; sourceTree = ""; }; + D92A3B8D23FB9B7E0089F6C3 /* CocoaAsyncSocketTests (tvOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (tvOS).xctestplan"; sourceTree = ""; }; D9486AD81E62B9F8002FE3B3 /* CocoaAsyncSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CocoaAsyncSocket.xcodeproj; path = ../../CocoaAsyncSocket.xcodeproj; sourceTree = ""; }; D9486AF41E62BA66002FE3B3 /* CocoaAsyncSocketTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CocoaAsyncSocketTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D9486B061E62BB3D002FE3B3 /* CocoaAsyncSocketTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CocoaAsyncSocketTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -186,6 +189,9 @@ children = ( D9486AD81E62B9F8002FE3B3 /* CocoaAsyncSocket.xcodeproj */, D9873DA11A057F34004C014F /* Tests */, + D92A3B8B23FB9B250089F6C3 /* CocoaAsyncSocketTests (macOS).xctestplan */, + D92A3B8C23FB9B680089F6C3 /* CocoaAsyncSocketTests (iOS).xctestplan */, + D92A3B8D23FB9B7E0089F6C3 /* CocoaAsyncSocketTests (tvOS).xctestplan */, D9BC0D801A0457F40059D906 /* Products */, 6BD64EE47346406202F80C93 /* Frameworks */, ); diff --git a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (iOS).xcscheme b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (iOS).xcscheme index 2b03399e..9d5fa5d8 100644 --- a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (iOS).xcscheme +++ b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (iOS).xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> @@ -27,6 +27,12 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -39,8 +45,6 @@ - - - - - - - - diff --git a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (macOS).xcscheme b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (macOS).xcscheme index e3610793..24c9a963 100644 --- a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (macOS).xcscheme +++ b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (macOS).xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> @@ -27,6 +27,12 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -39,8 +45,6 @@ - - - - - - - - diff --git a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (tvOS).xcscheme b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (tvOS).xcscheme index 70557df8..c5522312 100644 --- a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (tvOS).xcscheme +++ b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTests (tvOS).xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> @@ -27,6 +27,12 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -39,8 +45,6 @@ - - - - - - - - diff --git a/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj b/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj index 83de13dd..320ad973 100644 --- a/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj +++ b/Tests/Mac/CocoaAsyncSocket.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 871084F323FA9C140004F896 /* SecureSocketServer.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = SecureSocketServer.p12; sourceTree = ""; }; 871084F423FA9C140004F896 /* TestSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSocket.swift; sourceTree = ""; }; 871084F523FA9C140004F896 /* GCDAsyncSocketReadTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GCDAsyncSocketReadTests.swift; sourceTree = ""; }; + D92A3B9123FB9DF70089F6C3 /* CocoaAsyncSocketTestsMac.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = file; path = CocoaAsyncSocketTestsMac.xctestplan; sourceTree = SOURCE_ROOT; }; D9BC0D8D1A0458EF0059D906 /* CocoaAsyncSocketTestsMac.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CocoaAsyncSocketTestsMac.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D9BC0D901A0458EF0059D906 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -136,6 +137,7 @@ isa = PBXGroup; children = ( D9BC0D901A0458EF0059D906 /* Info.plist */, + D92A3B9123FB9DF70089F6C3 /* CocoaAsyncSocketTestsMac.xctestplan */, ); name = "Supporting Files"; sourceTree = ""; diff --git a/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme b/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme index c0f29680..a742f442 100644 --- a/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme +++ b/Tests/Mac/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsMac.xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> @@ -36,6 +36,12 @@ ReferencedContainer = "container:CocoaAsyncSocket.xcodeproj"> + + + + @@ -75,15 +81,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> - - - - diff --git a/Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan b/Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan new file mode 100644 index 00000000..d3a7e2a6 --- /dev/null +++ b/Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan @@ -0,0 +1,29 @@ +{ + "configurations" : [ + { + "id" : "87887487-ED22-40F5-95B9-2189A9E6A629", + "name" : "Configuration 1", + "options" : { + + } + } + ], + "defaultOptions" : { + "codeCoverage" : false, + "targetForVariableExpansion" : { + "containerPath" : "container:CocoaAsyncSocket.xcodeproj", + "identifier" : "D9BC0D8C1A0458EF0059D906", + "name" : "CocoaAsyncSocketTestsMac" + } + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:CocoaAsyncSocket.xcodeproj", + "identifier" : "D9BC0D8C1A0458EF0059D906", + "name" : "CocoaAsyncSocketTestsMac" + } + } + ], + "version" : 1 +} diff --git a/Tests/iOS/CocoaAsyncSocket.xcodeproj/project.pbxproj b/Tests/iOS/CocoaAsyncSocket.xcodeproj/project.pbxproj index 6742559c..8811c4ef 100644 --- a/Tests/iOS/CocoaAsyncSocket.xcodeproj/project.pbxproj +++ b/Tests/iOS/CocoaAsyncSocket.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 8710850323FA9C920004F896 /* SecureSocketServer.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = SecureSocketServer.p12; sourceTree = ""; }; 8710850423FA9C920004F896 /* TestSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSocket.swift; sourceTree = ""; }; 8710850523FA9C920004F896 /* GCDAsyncSocketReadTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GCDAsyncSocketReadTests.swift; sourceTree = ""; }; + D92A3B9023FB9DBB0089F6C3 /* CocoaAsyncSocketTestsiOS.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = file; path = CocoaAsyncSocketTestsiOS.xctestplan; sourceTree = SOURCE_ROOT; }; D9BC0D7F1A0457F40059D906 /* CocoaAsyncSocketTestsiOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CocoaAsyncSocketTestsiOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D9BC0D831A0457F40059D906 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -133,6 +134,7 @@ isa = PBXGroup; children = ( D9BC0D831A0457F40059D906 /* Info.plist */, + D92A3B9023FB9DBB0089F6C3 /* CocoaAsyncSocketTestsiOS.xctestplan */, ); name = "Supporting Files"; sourceTree = ""; diff --git a/Tests/iOS/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsiOS.xcscheme b/Tests/iOS/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsiOS.xcscheme index 6d907b11..95a952f8 100644 --- a/Tests/iOS/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsiOS.xcscheme +++ b/Tests/iOS/CocoaAsyncSocket.xcodeproj/xcshareddata/xcschemes/CocoaAsyncSocketTestsiOS.xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> @@ -36,6 +36,12 @@ ReferencedContainer = "container:CocoaAsyncSocket.xcodeproj"> + + + + @@ -75,15 +81,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> - - - - diff --git a/Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan b/Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan new file mode 100644 index 00000000..17b13397 --- /dev/null +++ b/Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan @@ -0,0 +1,29 @@ +{ + "configurations" : [ + { + "id" : "74EAC550-EFBA-43AF-AC26-26063B9B5017", + "name" : "Configuration 1", + "options" : { + + } + } + ], + "defaultOptions" : { + "codeCoverage" : false, + "targetForVariableExpansion" : { + "containerPath" : "container:CocoaAsyncSocket.xcodeproj", + "identifier" : "D9BC0D7E1A0457F40059D906", + "name" : "CocoaAsyncSocketTestsiOS" + } + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:CocoaAsyncSocket.xcodeproj", + "identifier" : "D9BC0D7E1A0457F40059D906", + "name" : "CocoaAsyncSocketTestsiOS" + } + } + ], + "version" : 1 +} From 260b06c9cdad050c7a556517ed10413acfe07b95 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Mon, 17 Feb 2020 21:08:37 -0800 Subject: [PATCH 3/6] Enable code coverage --- .../Framework/CocoaAsyncSocketTests (iOS).xctestplan | 1 - .../CocoaAsyncSocketTests (macOS).xctestplan | 1 - .../CocoaAsyncSocketTests (tvOS).xctestplan | 1 - .../CocoaAsyncSocketTests.xcodeproj/project.pbxproj | 12 ++++++------ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan b/Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan index 31ef4573..eb3be53e 100644 --- a/Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan +++ b/Tests/Framework/CocoaAsyncSocketTests (iOS).xctestplan @@ -9,7 +9,6 @@ } ], "defaultOptions" : { - "codeCoverage" : false, "targetForVariableExpansion" : { "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", "identifier" : "D9486AE71E62BA66002FE3B3", diff --git a/Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan b/Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan index d4832cdb..849d9e69 100644 --- a/Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan +++ b/Tests/Framework/CocoaAsyncSocketTests (macOS).xctestplan @@ -9,7 +9,6 @@ } ], "defaultOptions" : { - "codeCoverage" : false, "targetForVariableExpansion" : { "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", "identifier" : "D9BC0D8C1A0458EF0059D906", diff --git a/Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan b/Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan index 3ff5c173..767ad697 100644 --- a/Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan +++ b/Tests/Framework/CocoaAsyncSocketTests (tvOS).xctestplan @@ -9,7 +9,6 @@ } ], "defaultOptions" : { - "codeCoverage" : false, "targetForVariableExpansion" : { "containerPath" : "container:CocoaAsyncSocketTests.xcodeproj", "identifier" : "D9486AF91E62BB3D002FE3B3", diff --git a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj index f3ae2f43..0e67bdf1 100644 --- a/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj +++ b/Tests/Framework/CocoaAsyncSocketTests.xcodeproj/project.pbxproj @@ -88,9 +88,9 @@ 8710851B23FAA4E00004F896 /* SecureSocketServer.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = SecureSocketServer.p12; sourceTree = ""; }; 8710851C23FAA4E00004F896 /* TestSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSocket.swift; sourceTree = ""; }; 8710851D23FAA4E00004F896 /* GCDAsyncSocketReadTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GCDAsyncSocketReadTests.swift; sourceTree = ""; }; - D92A3B8B23FB9B250089F6C3 /* CocoaAsyncSocketTests (macOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (macOS).xctestplan"; sourceTree = ""; }; - D92A3B8C23FB9B680089F6C3 /* CocoaAsyncSocketTests (iOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (iOS).xctestplan"; sourceTree = ""; }; - D92A3B8D23FB9B7E0089F6C3 /* CocoaAsyncSocketTests (tvOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (tvOS).xctestplan"; sourceTree = ""; }; + D92A3B9323FBA8400089F6C3 /* CocoaAsyncSocketTests (iOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (iOS).xctestplan"; sourceTree = ""; }; + D92A3B9423FBA8400089F6C3 /* CocoaAsyncSocketTests (tvOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (tvOS).xctestplan"; sourceTree = ""; }; + D92A3B9523FBA8400089F6C3 /* CocoaAsyncSocketTests (macOS).xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "CocoaAsyncSocketTests (macOS).xctestplan"; sourceTree = ""; }; D9486AD81E62B9F8002FE3B3 /* CocoaAsyncSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CocoaAsyncSocket.xcodeproj; path = ../../CocoaAsyncSocket.xcodeproj; sourceTree = ""; }; D9486AF41E62BA66002FE3B3 /* CocoaAsyncSocketTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CocoaAsyncSocketTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D9486B061E62BB3D002FE3B3 /* CocoaAsyncSocketTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CocoaAsyncSocketTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -178,6 +178,9 @@ D9873DA11A057F34004C014F /* Tests */ = { isa = PBXGroup; children = ( + D92A3B9323FBA8400089F6C3 /* CocoaAsyncSocketTests (iOS).xctestplan */, + D92A3B9523FBA8400089F6C3 /* CocoaAsyncSocketTests (macOS).xctestplan */, + D92A3B9423FBA8400089F6C3 /* CocoaAsyncSocketTests (tvOS).xctestplan */, D938B4E61B752ED800FE8AB3 /* Shared */, D9BC0D8E1A0458EF0059D906 /* Mac */, ); @@ -189,9 +192,6 @@ children = ( D9486AD81E62B9F8002FE3B3 /* CocoaAsyncSocket.xcodeproj */, D9873DA11A057F34004C014F /* Tests */, - D92A3B8B23FB9B250089F6C3 /* CocoaAsyncSocketTests (macOS).xctestplan */, - D92A3B8C23FB9B680089F6C3 /* CocoaAsyncSocketTests (iOS).xctestplan */, - D92A3B8D23FB9B7E0089F6C3 /* CocoaAsyncSocketTests (tvOS).xctestplan */, D9BC0D801A0457F40059D906 /* Products */, 6BD64EE47346406202F80C93 /* Frameworks */, ); From 99d5bf10e8ff1e7360de464aca281b7860661422 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Mon, 17 Feb 2020 21:10:45 -0800 Subject: [PATCH 4/6] Enable coverage --- Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan | 1 - Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan | 1 - 2 files changed, 2 deletions(-) diff --git a/Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan b/Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan index d3a7e2a6..7795ad26 100644 --- a/Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan +++ b/Tests/Mac/CocoaAsyncSocketTestsMac.xctestplan @@ -9,7 +9,6 @@ } ], "defaultOptions" : { - "codeCoverage" : false, "targetForVariableExpansion" : { "containerPath" : "container:CocoaAsyncSocket.xcodeproj", "identifier" : "D9BC0D8C1A0458EF0059D906", diff --git a/Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan b/Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan index 17b13397..1c84f07f 100644 --- a/Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan +++ b/Tests/iOS/CocoaAsyncSocketTestsiOS.xctestplan @@ -9,7 +9,6 @@ } ], "defaultOptions" : { - "codeCoverage" : false, "targetForVariableExpansion" : { "containerPath" : "container:CocoaAsyncSocket.xcodeproj", "identifier" : "D9BC0D7E1A0457F40059D906", From 340dab230e796a3f7763ca54eb3645560c8a90f8 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Mon, 17 Feb 2020 21:24:12 -0800 Subject: [PATCH 5/6] Lint pod & ignore deprecation warnings for kCFStreamNetworkServiceTypeVoIP --- .travis.yml | 3 ++- Source/GCD/GCDAsyncSocket.m | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba406991..bd5088a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ osx_image: xcode11.3 language: objective-c install: - - cd Tests - bundle install + - cd Tests - bundle exec pod install --project-directory=./iOS - bundle exec pod install --project-directory=./Mac - cd ../ @@ -13,3 +13,4 @@ script: - bash Tests/test-all.sh - swift build - swift test + - bundle exec pod lib lint diff --git a/Source/GCD/GCDAsyncSocket.m b/Source/GCD/GCDAsyncSocket.m index 7dde4620..1bbbaf4f 100755 --- a/Source/GCD/GCDAsyncSocket.m +++ b/Source/GCD/GCDAsyncSocket.m @@ -8164,9 +8164,12 @@ - (BOOL)enableBackgroundingOnSocketWithCaveat:(BOOL)caveat LogVerbose(@"Enabling backgrouding on socket"); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" r1 = CFReadStreamSetProperty(readStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); r2 = CFWriteStreamSetProperty(writeStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); - +#pragma clang diagnostic pop + if (!r1 || !r2) { return NO; From 2d12a35c4696ce73a9af0f47bcabc167760bb519 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Mon, 17 Feb 2020 21:31:06 -0800 Subject: [PATCH 6/6] Test carthage builds --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bd5088a8..6d56c213 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,4 @@ script: - swift build - swift test - bundle exec pod lib lint + - carthage build --no-skip-current && for platform in Mac iOS tvOS; do test -d Carthage/Build/${platform}/CocoaAsyncSocket.framework || exit 1; done