From 5004e029d984c379e844fc08cc417bf494df1632 Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Thu, 15 Oct 2020 18:20:58 +0100 Subject: [PATCH 1/4] Allow autogenerated xcodeproj (from 'swift package generate-xcodeproj'). --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 95c4320..ea8c4eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .DS_Store /.build /Packages -/*.xcodeproj xcuserdata/ From 9bf6cc2a29bdde5049a0150bc24e90e16074c545 Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Thu, 15 Oct 2020 18:21:53 +0100 Subject: [PATCH 2/4] Add autogenerated .xcodeproj file. --- .../NWWebSocketTests_Info.plist | 25 + NWWebSocket.xcodeproj/NWWebSocket_Info.plist | 25 + NWWebSocket.xcodeproj/project.pbxproj | 604 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcschemes/NWWebSocket-Package.xcscheme | 68 ++ 7 files changed, 745 insertions(+) create mode 100644 NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist create mode 100644 NWWebSocket.xcodeproj/NWWebSocket_Info.plist create mode 100644 NWWebSocket.xcodeproj/project.pbxproj create mode 100644 NWWebSocket.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 NWWebSocket.xcodeproj/xcshareddata/xcschemes/NWWebSocket-Package.xcscheme diff --git a/NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist b/NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist new file mode 100644 index 0000000..7c23420 --- /dev/null +++ b/NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist @@ -0,0 +1,25 @@ + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/NWWebSocket.xcodeproj/NWWebSocket_Info.plist b/NWWebSocket.xcodeproj/NWWebSocket_Info.plist new file mode 100644 index 0000000..57ada9f --- /dev/null +++ b/NWWebSocket.xcodeproj/NWWebSocket_Info.plist @@ -0,0 +1,25 @@ + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/NWWebSocket.xcodeproj/project.pbxproj b/NWWebSocket.xcodeproj/project.pbxproj new file mode 100644 index 0000000..ff1b3d0 --- /dev/null +++ b/NWWebSocket.xcodeproj/project.pbxproj @@ -0,0 +1,604 @@ +// !$*UTF8*$! +{ + archiveVersion = "1"; + objectVersion = "46"; + objects = { + "NWWebSocket::NWWebSocket" = { + isa = "PBXNativeTarget"; + buildConfigurationList = "OBJ_23"; + buildPhases = ( + "OBJ_26", + "OBJ_29" + ); + dependencies = ( + ); + name = "NWWebSocket"; + productName = "NWWebSocket"; + productReference = "NWWebSocket::NWWebSocket::Product"; + productType = "com.apple.product-type.framework"; + }; + "NWWebSocket::NWWebSocket::Product" = { + isa = "PBXFileReference"; + path = "NWWebSocket.framework"; + sourceTree = "BUILT_PRODUCTS_DIR"; + }; + "NWWebSocket::NWWebSocketPackageTests::ProductTarget" = { + isa = "PBXAggregateTarget"; + buildConfigurationList = "OBJ_37"; + buildPhases = ( + ); + dependencies = ( + "OBJ_40" + ); + name = "NWWebSocketPackageTests"; + productName = "NWWebSocketPackageTests"; + }; + "NWWebSocket::NWWebSocketTests" = { + isa = "PBXNativeTarget"; + buildConfigurationList = "OBJ_42"; + buildPhases = ( + "OBJ_45", + "OBJ_48" + ); + dependencies = ( + "OBJ_50" + ); + name = "NWWebSocketTests"; + productName = "NWWebSocketTests"; + productReference = "NWWebSocket::NWWebSocketTests::Product"; + productType = "com.apple.product-type.bundle.unit-test"; + }; + "NWWebSocket::NWWebSocketTests::Product" = { + isa = "PBXFileReference"; + path = "NWWebSocketTests.xctest"; + sourceTree = "BUILT_PRODUCTS_DIR"; + }; + "NWWebSocket::SwiftPMPackageDescription" = { + isa = "PBXNativeTarget"; + buildConfigurationList = "OBJ_31"; + buildPhases = ( + "OBJ_34" + ); + dependencies = ( + ); + name = "NWWebSocketPackageDescription"; + productName = "NWWebSocketPackageDescription"; + productType = "com.apple.product-type.framework"; + }; + "OBJ_1" = { + isa = "PBXProject"; + attributes = { + LastSwiftMigration = "9999"; + LastUpgradeCheck = "9999"; + }; + buildConfigurationList = "OBJ_2"; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = "en"; + hasScannedForEncodings = "0"; + knownRegions = ( + "en" + ); + mainGroup = "OBJ_5"; + productRefGroup = "OBJ_17"; + projectDirPath = "."; + targets = ( + "NWWebSocket::NWWebSocket", + "NWWebSocket::SwiftPMPackageDescription", + "NWWebSocket::NWWebSocketPackageTests::ProductTarget", + "NWWebSocket::NWWebSocketTests" + ); + }; + "OBJ_10" = { + isa = "PBXFileReference"; + path = "NWWebSocket.swift"; + sourceTree = ""; + }; + "OBJ_11" = { + isa = "PBXGroup"; + children = ( + "OBJ_12" + ); + name = "Protocol"; + path = "Protocol"; + sourceTree = ""; + }; + "OBJ_12" = { + isa = "PBXFileReference"; + path = "WebSocketConnection.swift"; + sourceTree = ""; + }; + "OBJ_13" = { + isa = "PBXGroup"; + children = ( + "OBJ_14" + ); + name = "Tests"; + path = ""; + sourceTree = "SOURCE_ROOT"; + }; + "OBJ_14" = { + isa = "PBXGroup"; + children = ( + "OBJ_15", + "OBJ_16" + ); + name = "NWWebSocketTests"; + path = "Tests/NWWebSocketTests"; + sourceTree = "SOURCE_ROOT"; + }; + "OBJ_15" = { + isa = "PBXFileReference"; + path = "NWWebSocketTests.swift"; + sourceTree = ""; + }; + "OBJ_16" = { + isa = "PBXFileReference"; + path = "XCTestManifests.swift"; + sourceTree = ""; + }; + "OBJ_17" = { + isa = "PBXGroup"; + children = ( + "NWWebSocket::NWWebSocketTests::Product", + "NWWebSocket::NWWebSocket::Product" + ); + name = "Products"; + path = ""; + sourceTree = "BUILT_PRODUCTS_DIR"; + }; + "OBJ_2" = { + isa = "XCConfigurationList"; + buildConfigurations = ( + "OBJ_3", + "OBJ_4" + ); + defaultConfigurationIsVisible = "0"; + defaultConfigurationName = "Release"; + }; + "OBJ_20" = { + isa = "PBXFileReference"; + path = "LICENSE.md"; + sourceTree = ""; + }; + "OBJ_21" = { + isa = "PBXFileReference"; + path = "README.md"; + sourceTree = ""; + }; + "OBJ_23" = { + isa = "XCConfigurationList"; + buildConfigurations = ( + "OBJ_24", + "OBJ_25" + ); + defaultConfigurationIsVisible = "0"; + defaultConfigurationName = "Release"; + }; + "OBJ_24" = { + isa = "XCBuildConfiguration"; + buildSettings = { + ENABLE_TESTABILITY = "YES"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)" + ); + INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocket_Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = "13.0"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx" + ); + MACOSX_DEPLOYMENT_TARGET = "10.15"; + OTHER_CFLAGS = ( + "$(inherited)" + ); + OTHER_LDFLAGS = ( + "$(inherited)" + ); + OTHER_SWIFT_FLAGS = ( + "$(inherited)" + ); + PRODUCT_BUNDLE_IDENTIFIER = "NWWebSocket"; + PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = "YES"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)" + ); + SWIFT_VERSION = "5.0"; + TARGET_NAME = "NWWebSocket"; + TVOS_DEPLOYMENT_TARGET = "13.0"; + WATCHOS_DEPLOYMENT_TARGET = "2.0"; + }; + name = "Debug"; + }; + "OBJ_25" = { + isa = "XCBuildConfiguration"; + buildSettings = { + ENABLE_TESTABILITY = "YES"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)" + ); + INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocket_Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = "13.0"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx" + ); + MACOSX_DEPLOYMENT_TARGET = "10.15"; + OTHER_CFLAGS = ( + "$(inherited)" + ); + OTHER_LDFLAGS = ( + "$(inherited)" + ); + OTHER_SWIFT_FLAGS = ( + "$(inherited)" + ); + PRODUCT_BUNDLE_IDENTIFIER = "NWWebSocket"; + PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = "YES"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)" + ); + SWIFT_VERSION = "5.0"; + TARGET_NAME = "NWWebSocket"; + TVOS_DEPLOYMENT_TARGET = "13.0"; + WATCHOS_DEPLOYMENT_TARGET = "2.0"; + }; + name = "Release"; + }; + "OBJ_26" = { + isa = "PBXSourcesBuildPhase"; + files = ( + "OBJ_27", + "OBJ_28" + ); + }; + "OBJ_27" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_10"; + }; + "OBJ_28" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_12"; + }; + "OBJ_29" = { + isa = "PBXFrameworksBuildPhase"; + files = ( + ); + }; + "OBJ_3" = { + isa = "XCBuildConfiguration"; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = "YES"; + COMBINE_HIDPI_IMAGES = "YES"; + COPY_PHASE_STRIP = "NO"; + DEBUG_INFORMATION_FORMAT = "dwarf"; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = "YES"; + GCC_OPTIMIZATION_LEVEL = "0"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE=1", + "DEBUG=1" + ); + MACOSX_DEPLOYMENT_TARGET = "10.10"; + ONLY_ACTIVE_ARCH = "YES"; + OTHER_SWIFT_FLAGS = ( + "$(inherited)", + "-DXcode" + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = "macosx"; + SUPPORTED_PLATFORMS = ( + "macosx", + "iphoneos", + "iphonesimulator", + "appletvos", + "appletvsimulator", + "watchos", + "watchsimulator" + ); + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE", + "DEBUG" + ); + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + USE_HEADERMAP = "NO"; + }; + name = "Debug"; + }; + "OBJ_31" = { + isa = "XCConfigurationList"; + buildConfigurations = ( + "OBJ_32", + "OBJ_33" + ); + defaultConfigurationIsVisible = "0"; + defaultConfigurationName = "Release"; + }; + "OBJ_32" = { + isa = "XCBuildConfiguration"; + buildSettings = { + LD = "/usr/bin/true"; + OTHER_SWIFT_FLAGS = ( + "-swift-version", + "5", + "-I", + "$(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2", + "-sdk", + "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk", + "-package-description-version", + "5.0.0" + ); + SWIFT_VERSION = "5.0"; + }; + name = "Debug"; + }; + "OBJ_33" = { + isa = "XCBuildConfiguration"; + buildSettings = { + LD = "/usr/bin/true"; + OTHER_SWIFT_FLAGS = ( + "-swift-version", + "5", + "-I", + "$(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2", + "-sdk", + "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk", + "-package-description-version", + "5.0.0" + ); + SWIFT_VERSION = "5.0"; + }; + name = "Release"; + }; + "OBJ_34" = { + isa = "PBXSourcesBuildPhase"; + files = ( + "OBJ_35" + ); + }; + "OBJ_35" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_6"; + }; + "OBJ_37" = { + isa = "XCConfigurationList"; + buildConfigurations = ( + "OBJ_38", + "OBJ_39" + ); + defaultConfigurationIsVisible = "0"; + defaultConfigurationName = "Release"; + }; + "OBJ_38" = { + isa = "XCBuildConfiguration"; + buildSettings = { + }; + name = "Debug"; + }; + "OBJ_39" = { + isa = "XCBuildConfiguration"; + buildSettings = { + }; + name = "Release"; + }; + "OBJ_4" = { + isa = "XCBuildConfiguration"; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = "YES"; + COMBINE_HIDPI_IMAGES = "YES"; + COPY_PHASE_STRIP = "YES"; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_OPTIMIZATION_LEVEL = "s"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE=1" + ); + MACOSX_DEPLOYMENT_TARGET = "10.10"; + OTHER_SWIFT_FLAGS = ( + "$(inherited)", + "-DXcode" + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = "macosx"; + SUPPORTED_PLATFORMS = ( + "macosx", + "iphoneos", + "iphonesimulator", + "appletvos", + "appletvsimulator", + "watchos", + "watchsimulator" + ); + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE" + ); + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + USE_HEADERMAP = "NO"; + }; + name = "Release"; + }; + "OBJ_40" = { + isa = "PBXTargetDependency"; + target = "NWWebSocket::NWWebSocketTests"; + }; + "OBJ_42" = { + isa = "XCConfigurationList"; + buildConfigurations = ( + "OBJ_43", + "OBJ_44" + ); + defaultConfigurationIsVisible = "0"; + defaultConfigurationName = "Release"; + }; + "OBJ_43" = { + isa = "XCBuildConfiguration"; + buildSettings = { + CLANG_ENABLE_MODULES = "YES"; + EMBEDDED_CONTENT_CONTAINS_SWIFT = "YES"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)" + ); + INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = "14.0"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@loader_path/../Frameworks", + "@loader_path/Frameworks" + ); + MACOSX_DEPLOYMENT_TARGET = "10.15"; + OTHER_CFLAGS = ( + "$(inherited)" + ); + OTHER_LDFLAGS = ( + "$(inherited)" + ); + OTHER_SWIFT_FLAGS = ( + "$(inherited)" + ); + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)" + ); + SWIFT_VERSION = "5.0"; + TARGET_NAME = "NWWebSocketTests"; + TVOS_DEPLOYMENT_TARGET = "13.0"; + WATCHOS_DEPLOYMENT_TARGET = "2.0"; + }; + name = "Debug"; + }; + "OBJ_44" = { + isa = "XCBuildConfiguration"; + buildSettings = { + CLANG_ENABLE_MODULES = "YES"; + EMBEDDED_CONTENT_CONTAINS_SWIFT = "YES"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)" + ); + INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = "14.0"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@loader_path/../Frameworks", + "@loader_path/Frameworks" + ); + MACOSX_DEPLOYMENT_TARGET = "10.15"; + OTHER_CFLAGS = ( + "$(inherited)" + ); + OTHER_LDFLAGS = ( + "$(inherited)" + ); + OTHER_SWIFT_FLAGS = ( + "$(inherited)" + ); + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)" + ); + SWIFT_VERSION = "5.0"; + TARGET_NAME = "NWWebSocketTests"; + TVOS_DEPLOYMENT_TARGET = "13.0"; + WATCHOS_DEPLOYMENT_TARGET = "2.0"; + }; + name = "Release"; + }; + "OBJ_45" = { + isa = "PBXSourcesBuildPhase"; + files = ( + "OBJ_46", + "OBJ_47" + ); + }; + "OBJ_46" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_15"; + }; + "OBJ_47" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_16"; + }; + "OBJ_48" = { + isa = "PBXFrameworksBuildPhase"; + files = ( + "OBJ_49" + ); + }; + "OBJ_49" = { + isa = "PBXBuildFile"; + fileRef = "NWWebSocket::NWWebSocket::Product"; + }; + "OBJ_5" = { + isa = "PBXGroup"; + children = ( + "OBJ_6", + "OBJ_7", + "OBJ_13", + "OBJ_17", + "OBJ_20", + "OBJ_21" + ); + path = ""; + sourceTree = ""; + }; + "OBJ_50" = { + isa = "PBXTargetDependency"; + target = "NWWebSocket::NWWebSocket"; + }; + "OBJ_6" = { + isa = "PBXFileReference"; + explicitFileType = "sourcecode.swift"; + path = "Package.swift"; + sourceTree = ""; + }; + "OBJ_7" = { + isa = "PBXGroup"; + children = ( + "OBJ_8" + ); + name = "Sources"; + path = ""; + sourceTree = "SOURCE_ROOT"; + }; + "OBJ_8" = { + isa = "PBXGroup"; + children = ( + "OBJ_9", + "OBJ_11" + ); + name = "NWWebSocket"; + path = "Sources/NWWebSocket"; + sourceTree = "SOURCE_ROOT"; + }; + "OBJ_9" = { + isa = "PBXGroup"; + children = ( + "OBJ_10" + ); + name = "Model"; + path = "Model"; + sourceTree = ""; + }; + }; + rootObject = "OBJ_1"; +} diff --git a/NWWebSocket.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/NWWebSocket.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..fe1aa71 --- /dev/null +++ b/NWWebSocket.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..a72dc2b --- /dev/null +++ b/NWWebSocket.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + + \ No newline at end of file diff --git a/NWWebSocket.xcodeproj/xcshareddata/xcschemes/NWWebSocket-Package.xcscheme b/NWWebSocket.xcodeproj/xcshareddata/xcschemes/NWWebSocket-Package.xcscheme new file mode 100644 index 0000000..0acc26c --- /dev/null +++ b/NWWebSocket.xcodeproj/xcshareddata/xcschemes/NWWebSocket-Package.xcscheme @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8fbe4c70bf58c00dfc9b015541abb947dbc266ee Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Thu, 15 Oct 2020 18:56:34 +0100 Subject: [PATCH 3/4] Manually remove watchOS from supported platforms. --- NWWebSocket.xcodeproj/project.pbxproj | 1112 ++++++++++++------------- 1 file changed, 511 insertions(+), 601 deletions(-) diff --git a/NWWebSocket.xcodeproj/project.pbxproj b/NWWebSocket.xcodeproj/project.pbxproj index ff1b3d0..bc4f3e2 100644 --- a/NWWebSocket.xcodeproj/project.pbxproj +++ b/NWWebSocket.xcodeproj/project.pbxproj @@ -1,604 +1,514 @@ // !$*UTF8*$! { - archiveVersion = "1"; - objectVersion = "46"; - objects = { - "NWWebSocket::NWWebSocket" = { - isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_23"; - buildPhases = ( - "OBJ_26", - "OBJ_29" - ); - dependencies = ( - ); - name = "NWWebSocket"; - productName = "NWWebSocket"; - productReference = "NWWebSocket::NWWebSocket::Product"; - productType = "com.apple.product-type.framework"; - }; - "NWWebSocket::NWWebSocket::Product" = { - isa = "PBXFileReference"; - path = "NWWebSocket.framework"; - sourceTree = "BUILT_PRODUCTS_DIR"; - }; - "NWWebSocket::NWWebSocketPackageTests::ProductTarget" = { - isa = "PBXAggregateTarget"; - buildConfigurationList = "OBJ_37"; - buildPhases = ( - ); - dependencies = ( - "OBJ_40" - ); - name = "NWWebSocketPackageTests"; - productName = "NWWebSocketPackageTests"; - }; - "NWWebSocket::NWWebSocketTests" = { - isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_42"; - buildPhases = ( - "OBJ_45", - "OBJ_48" - ); - dependencies = ( - "OBJ_50" - ); - name = "NWWebSocketTests"; - productName = "NWWebSocketTests"; - productReference = "NWWebSocket::NWWebSocketTests::Product"; - productType = "com.apple.product-type.bundle.unit-test"; - }; - "NWWebSocket::NWWebSocketTests::Product" = { - isa = "PBXFileReference"; - path = "NWWebSocketTests.xctest"; - sourceTree = "BUILT_PRODUCTS_DIR"; - }; - "NWWebSocket::SwiftPMPackageDescription" = { - isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_31"; - buildPhases = ( - "OBJ_34" - ); - dependencies = ( - ); - name = "NWWebSocketPackageDescription"; - productName = "NWWebSocketPackageDescription"; - productType = "com.apple.product-type.framework"; - }; - "OBJ_1" = { - isa = "PBXProject"; - attributes = { - LastSwiftMigration = "9999"; - LastUpgradeCheck = "9999"; - }; - buildConfigurationList = "OBJ_2"; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = "en"; - hasScannedForEncodings = "0"; - knownRegions = ( - "en" - ); - mainGroup = "OBJ_5"; - productRefGroup = "OBJ_17"; - projectDirPath = "."; - targets = ( - "NWWebSocket::NWWebSocket", - "NWWebSocket::SwiftPMPackageDescription", - "NWWebSocket::NWWebSocketPackageTests::ProductTarget", - "NWWebSocket::NWWebSocketTests" - ); - }; - "OBJ_10" = { - isa = "PBXFileReference"; - path = "NWWebSocket.swift"; - sourceTree = ""; - }; - "OBJ_11" = { - isa = "PBXGroup"; - children = ( - "OBJ_12" - ); - name = "Protocol"; - path = "Protocol"; - sourceTree = ""; - }; - "OBJ_12" = { - isa = "PBXFileReference"; - path = "WebSocketConnection.swift"; - sourceTree = ""; - }; - "OBJ_13" = { - isa = "PBXGroup"; - children = ( - "OBJ_14" - ); - name = "Tests"; - path = ""; - sourceTree = "SOURCE_ROOT"; - }; - "OBJ_14" = { - isa = "PBXGroup"; - children = ( - "OBJ_15", - "OBJ_16" - ); - name = "NWWebSocketTests"; - path = "Tests/NWWebSocketTests"; - sourceTree = "SOURCE_ROOT"; - }; - "OBJ_15" = { - isa = "PBXFileReference"; - path = "NWWebSocketTests.swift"; - sourceTree = ""; - }; - "OBJ_16" = { - isa = "PBXFileReference"; - path = "XCTestManifests.swift"; - sourceTree = ""; - }; - "OBJ_17" = { - isa = "PBXGroup"; - children = ( - "NWWebSocket::NWWebSocketTests::Product", - "NWWebSocket::NWWebSocket::Product" - ); - name = "Products"; - path = ""; - sourceTree = "BUILT_PRODUCTS_DIR"; - }; - "OBJ_2" = { - isa = "XCConfigurationList"; - buildConfigurations = ( - "OBJ_3", - "OBJ_4" - ); - defaultConfigurationIsVisible = "0"; - defaultConfigurationName = "Release"; - }; - "OBJ_20" = { - isa = "PBXFileReference"; - path = "LICENSE.md"; - sourceTree = ""; - }; - "OBJ_21" = { - isa = "PBXFileReference"; - path = "README.md"; - sourceTree = ""; - }; - "OBJ_23" = { - isa = "XCConfigurationList"; - buildConfigurations = ( - "OBJ_24", - "OBJ_25" - ); - defaultConfigurationIsVisible = "0"; - defaultConfigurationName = "Release"; - }; - "OBJ_24" = { - isa = "XCBuildConfiguration"; - buildSettings = { - ENABLE_TESTABILITY = "YES"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)" - ); - INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocket_Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = "13.0"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx" - ); - MACOSX_DEPLOYMENT_TARGET = "10.15"; - OTHER_CFLAGS = ( - "$(inherited)" - ); - OTHER_LDFLAGS = ( - "$(inherited)" - ); - OTHER_SWIFT_FLAGS = ( - "$(inherited)" - ); - PRODUCT_BUNDLE_IDENTIFIER = "NWWebSocket"; - PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = "YES"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "$(inherited)" - ); - SWIFT_VERSION = "5.0"; - TARGET_NAME = "NWWebSocket"; - TVOS_DEPLOYMENT_TARGET = "13.0"; - WATCHOS_DEPLOYMENT_TARGET = "2.0"; - }; - name = "Debug"; - }; - "OBJ_25" = { - isa = "XCBuildConfiguration"; - buildSettings = { - ENABLE_TESTABILITY = "YES"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)" - ); - INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocket_Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = "13.0"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx" - ); - MACOSX_DEPLOYMENT_TARGET = "10.15"; - OTHER_CFLAGS = ( - "$(inherited)" - ); - OTHER_LDFLAGS = ( - "$(inherited)" - ); - OTHER_SWIFT_FLAGS = ( - "$(inherited)" - ); - PRODUCT_BUNDLE_IDENTIFIER = "NWWebSocket"; - PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = "YES"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "$(inherited)" - ); - SWIFT_VERSION = "5.0"; - TARGET_NAME = "NWWebSocket"; - TVOS_DEPLOYMENT_TARGET = "13.0"; - WATCHOS_DEPLOYMENT_TARGET = "2.0"; - }; - name = "Release"; - }; - "OBJ_26" = { - isa = "PBXSourcesBuildPhase"; - files = ( - "OBJ_27", - "OBJ_28" - ); - }; - "OBJ_27" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_10"; - }; - "OBJ_28" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_12"; - }; - "OBJ_29" = { - isa = "PBXFrameworksBuildPhase"; - files = ( - ); - }; - "OBJ_3" = { - isa = "XCBuildConfiguration"; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = "YES"; - COMBINE_HIDPI_IMAGES = "YES"; - COPY_PHASE_STRIP = "NO"; - DEBUG_INFORMATION_FORMAT = "dwarf"; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = "YES"; - GCC_OPTIMIZATION_LEVEL = "0"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SWIFT_PACKAGE=1", - "DEBUG=1" - ); - MACOSX_DEPLOYMENT_TARGET = "10.10"; - ONLY_ACTIVE_ARCH = "YES"; - OTHER_SWIFT_FLAGS = ( - "$(inherited)", - "-DXcode" - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = "macosx"; - SUPPORTED_PLATFORMS = ( - "macosx", - "iphoneos", - "iphonesimulator", - "appletvos", - "appletvsimulator", - "watchos", - "watchsimulator" - ); - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "$(inherited)", - "SWIFT_PACKAGE", - "DEBUG" - ); - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - USE_HEADERMAP = "NO"; - }; - name = "Debug"; - }; - "OBJ_31" = { - isa = "XCConfigurationList"; - buildConfigurations = ( - "OBJ_32", - "OBJ_33" - ); - defaultConfigurationIsVisible = "0"; - defaultConfigurationName = "Release"; - }; - "OBJ_32" = { - isa = "XCBuildConfiguration"; - buildSettings = { - LD = "/usr/bin/true"; - OTHER_SWIFT_FLAGS = ( - "-swift-version", - "5", - "-I", - "$(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2", - "-sdk", - "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk", - "-package-description-version", - "5.0.0" - ); - SWIFT_VERSION = "5.0"; - }; - name = "Debug"; - }; - "OBJ_33" = { - isa = "XCBuildConfiguration"; - buildSettings = { - LD = "/usr/bin/true"; - OTHER_SWIFT_FLAGS = ( - "-swift-version", - "5", - "-I", - "$(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2", - "-sdk", - "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk", - "-package-description-version", - "5.0.0" - ); - SWIFT_VERSION = "5.0"; - }; - name = "Release"; - }; - "OBJ_34" = { - isa = "PBXSourcesBuildPhase"; - files = ( - "OBJ_35" - ); - }; - "OBJ_35" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_6"; - }; - "OBJ_37" = { - isa = "XCConfigurationList"; - buildConfigurations = ( - "OBJ_38", - "OBJ_39" - ); - defaultConfigurationIsVisible = "0"; - defaultConfigurationName = "Release"; - }; - "OBJ_38" = { - isa = "XCBuildConfiguration"; - buildSettings = { - }; - name = "Debug"; - }; - "OBJ_39" = { - isa = "XCBuildConfiguration"; - buildSettings = { - }; - name = "Release"; - }; - "OBJ_4" = { - isa = "XCBuildConfiguration"; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = "YES"; - COMBINE_HIDPI_IMAGES = "YES"; - COPY_PHASE_STRIP = "YES"; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_OPTIMIZATION_LEVEL = "s"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SWIFT_PACKAGE=1" - ); - MACOSX_DEPLOYMENT_TARGET = "10.10"; - OTHER_SWIFT_FLAGS = ( - "$(inherited)", - "-DXcode" - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = "macosx"; - SUPPORTED_PLATFORMS = ( - "macosx", - "iphoneos", - "iphonesimulator", - "appletvos", - "appletvsimulator", - "watchos", - "watchsimulator" - ); - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "$(inherited)", - "SWIFT_PACKAGE" - ); - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - USE_HEADERMAP = "NO"; - }; - name = "Release"; - }; - "OBJ_40" = { - isa = "PBXTargetDependency"; - target = "NWWebSocket::NWWebSocketTests"; - }; - "OBJ_42" = { - isa = "XCConfigurationList"; - buildConfigurations = ( - "OBJ_43", - "OBJ_44" - ); - defaultConfigurationIsVisible = "0"; - defaultConfigurationName = "Release"; - }; - "OBJ_43" = { - isa = "XCBuildConfiguration"; - buildSettings = { - CLANG_ENABLE_MODULES = "YES"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = "YES"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)" - ); - INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = "14.0"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@loader_path/../Frameworks", - "@loader_path/Frameworks" - ); - MACOSX_DEPLOYMENT_TARGET = "10.15"; - OTHER_CFLAGS = ( - "$(inherited)" - ); - OTHER_LDFLAGS = ( - "$(inherited)" - ); - OTHER_SWIFT_FLAGS = ( - "$(inherited)" - ); - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "$(inherited)" - ); - SWIFT_VERSION = "5.0"; - TARGET_NAME = "NWWebSocketTests"; - TVOS_DEPLOYMENT_TARGET = "13.0"; - WATCHOS_DEPLOYMENT_TARGET = "2.0"; - }; - name = "Debug"; - }; - "OBJ_44" = { - isa = "XCBuildConfiguration"; - buildSettings = { - CLANG_ENABLE_MODULES = "YES"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = "YES"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)" - ); - INFOPLIST_FILE = "NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = "14.0"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@loader_path/../Frameworks", - "@loader_path/Frameworks" - ); - MACOSX_DEPLOYMENT_TARGET = "10.15"; - OTHER_CFLAGS = ( - "$(inherited)" - ); - OTHER_LDFLAGS = ( - "$(inherited)" - ); - OTHER_SWIFT_FLAGS = ( - "$(inherited)" - ); - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "$(inherited)" - ); - SWIFT_VERSION = "5.0"; - TARGET_NAME = "NWWebSocketTests"; - TVOS_DEPLOYMENT_TARGET = "13.0"; - WATCHOS_DEPLOYMENT_TARGET = "2.0"; - }; - name = "Release"; - }; - "OBJ_45" = { - isa = "PBXSourcesBuildPhase"; - files = ( - "OBJ_46", - "OBJ_47" - ); - }; - "OBJ_46" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_15"; - }; - "OBJ_47" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_16"; - }; - "OBJ_48" = { - isa = "PBXFrameworksBuildPhase"; - files = ( - "OBJ_49" - ); - }; - "OBJ_49" = { - isa = "PBXBuildFile"; - fileRef = "NWWebSocket::NWWebSocket::Product"; - }; - "OBJ_5" = { - isa = "PBXGroup"; - children = ( - "OBJ_6", - "OBJ_7", - "OBJ_13", - "OBJ_17", - "OBJ_20", - "OBJ_21" - ); - path = ""; - sourceTree = ""; - }; - "OBJ_50" = { - isa = "PBXTargetDependency"; - target = "NWWebSocket::NWWebSocket"; - }; - "OBJ_6" = { - isa = "PBXFileReference"; - explicitFileType = "sourcecode.swift"; - path = "Package.swift"; - sourceTree = ""; - }; - "OBJ_7" = { - isa = "PBXGroup"; - children = ( - "OBJ_8" - ); - name = "Sources"; - path = ""; - sourceTree = "SOURCE_ROOT"; - }; - "OBJ_8" = { - isa = "PBXGroup"; - children = ( - "OBJ_9", - "OBJ_11" - ); - name = "NWWebSocket"; - path = "Sources/NWWebSocket"; - sourceTree = "SOURCE_ROOT"; - }; - "OBJ_9" = { - isa = "PBXGroup"; - children = ( - "OBJ_10" - ); - name = "Model"; - path = "Model"; - sourceTree = ""; - }; - }; - rootObject = "OBJ_1"; + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXAggregateTarget section */ + "NWWebSocket::NWWebSocketPackageTests::ProductTarget" /* NWWebSocketPackageTests */ = { + isa = PBXAggregateTarget; + buildConfigurationList = OBJ_37 /* Build configuration list for PBXAggregateTarget "NWWebSocketPackageTests" */; + buildPhases = ( + ); + dependencies = ( + OBJ_40 /* PBXTargetDependency */, + ); + name = NWWebSocketPackageTests; + productName = NWWebSocketPackageTests; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + OBJ_27 /* NWWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* NWWebSocket.swift */; }; + OBJ_28 /* WebSocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* WebSocketConnection.swift */; }; + OBJ_35 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_6 /* Package.swift */; }; + OBJ_46 /* NWWebSocketTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* NWWebSocketTests.swift */; }; + OBJ_47 /* XCTestManifests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* XCTestManifests.swift */; }; + OBJ_49 /* NWWebSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "NWWebSocket::NWWebSocket::Product" /* NWWebSocket.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 53D1D0332538C49800E4B5BF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = OBJ_1 /* Project object */; + proxyType = 1; + remoteGlobalIDString = "NWWebSocket::NWWebSocket"; + remoteInfo = NWWebSocket; + }; + 53D1D0362538C49A00E4B5BF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = OBJ_1 /* Project object */; + proxyType = 1; + remoteGlobalIDString = "NWWebSocket::NWWebSocketTests"; + remoteInfo = NWWebSocketTests; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + "NWWebSocket::NWWebSocket::Product" /* NWWebSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = NWWebSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + "NWWebSocket::NWWebSocketTests::Product" /* NWWebSocketTests.xctest */ = {isa = PBXFileReference; lastKnownFileType = file; path = NWWebSocketTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + OBJ_10 /* NWWebSocket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NWWebSocket.swift; sourceTree = ""; }; + OBJ_12 /* WebSocketConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSocketConnection.swift; sourceTree = ""; }; + OBJ_15 /* NWWebSocketTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NWWebSocketTests.swift; sourceTree = ""; }; + OBJ_16 /* XCTestManifests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCTestManifests.swift; sourceTree = ""; }; + OBJ_20 /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = ""; }; + OBJ_21 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + OBJ_29 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + OBJ_48 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 0; + files = ( + OBJ_49 /* NWWebSocket.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + OBJ_11 /* Protocol */ = { + isa = PBXGroup; + children = ( + OBJ_12 /* WebSocketConnection.swift */, + ); + path = Protocol; + sourceTree = ""; + }; + OBJ_13 /* Tests */ = { + isa = PBXGroup; + children = ( + OBJ_14 /* NWWebSocketTests */, + ); + name = Tests; + sourceTree = SOURCE_ROOT; + }; + OBJ_14 /* NWWebSocketTests */ = { + isa = PBXGroup; + children = ( + OBJ_15 /* NWWebSocketTests.swift */, + OBJ_16 /* XCTestManifests.swift */, + ); + name = NWWebSocketTests; + path = Tests/NWWebSocketTests; + sourceTree = SOURCE_ROOT; + }; + OBJ_17 /* Products */ = { + isa = PBXGroup; + children = ( + "NWWebSocket::NWWebSocketTests::Product" /* NWWebSocketTests.xctest */, + "NWWebSocket::NWWebSocket::Product" /* NWWebSocket.framework */, + ); + name = Products; + sourceTree = BUILT_PRODUCTS_DIR; + }; + OBJ_5 /* */ = { + isa = PBXGroup; + children = ( + OBJ_6 /* Package.swift */, + OBJ_7 /* Sources */, + OBJ_13 /* Tests */, + OBJ_17 /* Products */, + OBJ_20 /* LICENSE.md */, + OBJ_21 /* README.md */, + ); + name = ""; + sourceTree = ""; + }; + OBJ_7 /* Sources */ = { + isa = PBXGroup; + children = ( + OBJ_8 /* NWWebSocket */, + ); + name = Sources; + sourceTree = SOURCE_ROOT; + }; + OBJ_8 /* NWWebSocket */ = { + isa = PBXGroup; + children = ( + OBJ_9 /* Model */, + OBJ_11 /* Protocol */, + ); + name = NWWebSocket; + path = Sources/NWWebSocket; + sourceTree = SOURCE_ROOT; + }; + OBJ_9 /* Model */ = { + isa = PBXGroup; + children = ( + OBJ_10 /* NWWebSocket.swift */, + ); + path = Model; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + "NWWebSocket::NWWebSocket" /* NWWebSocket */ = { + isa = PBXNativeTarget; + buildConfigurationList = OBJ_23 /* Build configuration list for PBXNativeTarget "NWWebSocket" */; + buildPhases = ( + OBJ_26 /* Sources */, + OBJ_29 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = NWWebSocket; + productName = NWWebSocket; + productReference = "NWWebSocket::NWWebSocket::Product" /* NWWebSocket.framework */; + productType = "com.apple.product-type.framework"; + }; + "NWWebSocket::NWWebSocketTests" /* NWWebSocketTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = OBJ_42 /* Build configuration list for PBXNativeTarget "NWWebSocketTests" */; + buildPhases = ( + OBJ_45 /* Sources */, + OBJ_48 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + OBJ_50 /* PBXTargetDependency */, + ); + name = NWWebSocketTests; + productName = NWWebSocketTests; + productReference = "NWWebSocket::NWWebSocketTests::Product" /* NWWebSocketTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + "NWWebSocket::SwiftPMPackageDescription" /* NWWebSocketPackageDescription */ = { + isa = PBXNativeTarget; + buildConfigurationList = OBJ_31 /* Build configuration list for PBXNativeTarget "NWWebSocketPackageDescription" */; + buildPhases = ( + OBJ_34 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = NWWebSocketPackageDescription; + productName = NWWebSocketPackageDescription; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + OBJ_1 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftMigration = 9999; + LastUpgradeCheck = 9999; + }; + buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "NWWebSocket" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = OBJ_5 /* */; + productRefGroup = OBJ_17 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + "NWWebSocket::NWWebSocket" /* NWWebSocket */, + "NWWebSocket::SwiftPMPackageDescription" /* NWWebSocketPackageDescription */, + "NWWebSocket::NWWebSocketPackageTests::ProductTarget" /* NWWebSocketPackageTests */, + "NWWebSocket::NWWebSocketTests" /* NWWebSocketTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + OBJ_26 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 0; + files = ( + OBJ_27 /* NWWebSocket.swift in Sources */, + OBJ_28 /* WebSocketConnection.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + OBJ_34 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 0; + files = ( + OBJ_35 /* Package.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + OBJ_45 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 0; + files = ( + OBJ_46 /* NWWebSocketTests.swift in Sources */, + OBJ_47 /* XCTestManifests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + OBJ_40 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = "NWWebSocket::NWWebSocketTests" /* NWWebSocketTests */; + targetProxy = 53D1D0362538C49A00E4B5BF /* PBXContainerItemProxy */; + }; + OBJ_50 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = "NWWebSocket::NWWebSocket" /* NWWebSocket */; + targetProxy = 53D1D0332538C49800E4B5BF /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + OBJ_24 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ENABLE_TESTABILITY = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = NWWebSocket.xcodeproj/NWWebSocket_Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + OTHER_CFLAGS = "$(inherited)"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = NWWebSocket; + PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + SWIFT_VERSION = 5.0; + TARGET_NAME = NWWebSocket; + TVOS_DEPLOYMENT_TARGET = 13.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Debug; + }; + OBJ_25 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ENABLE_TESTABILITY = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = NWWebSocket.xcodeproj/NWWebSocket_Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + OTHER_CFLAGS = "$(inherited)"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = NWWebSocket; + PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + SWIFT_VERSION = 5.0; + TARGET_NAME = NWWebSocket; + TVOS_DEPLOYMENT_TARGET = 13.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Release; + }; + OBJ_3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE=1", + "DEBUG=1", + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; + ONLY_ACTIVE_ARCH = YES; + OTHER_SWIFT_FLAGS = "$(inherited) -DXcode"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE DEBUG"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + USE_HEADERMAP = NO; + }; + name = Debug; + }; + OBJ_32 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + LD = /usr/bin/true; + OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -package-description-version 5.0.0"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + OBJ_33 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + LD = /usr/bin/true; + OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -package-description-version 5.0.0"; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + OBJ_38 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + OBJ_39 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; + OBJ_4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_OPTIMIZATION_LEVEL = s; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE=1", + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; + OTHER_SWIFT_FLAGS = "$(inherited) -DXcode"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + USE_HEADERMAP = NO; + }; + name = Release; + }; + OBJ_43 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + OTHER_CFLAGS = "$(inherited)"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + SWIFT_VERSION = 5.0; + TARGET_NAME = NWWebSocketTests; + TVOS_DEPLOYMENT_TARGET = 13.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Debug; + }; + OBJ_44 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = NWWebSocket.xcodeproj/NWWebSocketTests_Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + OTHER_CFLAGS = "$(inherited)"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; + SWIFT_VERSION = 5.0; + TARGET_NAME = NWWebSocketTests; + TVOS_DEPLOYMENT_TARGET = 13.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + OBJ_2 /* Build configuration list for PBXProject "NWWebSocket" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + OBJ_3 /* Debug */, + OBJ_4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + OBJ_23 /* Build configuration list for PBXNativeTarget "NWWebSocket" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + OBJ_24 /* Debug */, + OBJ_25 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + OBJ_31 /* Build configuration list for PBXNativeTarget "NWWebSocketPackageDescription" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + OBJ_32 /* Debug */, + OBJ_33 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + OBJ_37 /* Build configuration list for PBXAggregateTarget "NWWebSocketPackageTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + OBJ_38 /* Debug */, + OBJ_39 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + OBJ_42 /* Build configuration list for PBXNativeTarget "NWWebSocketTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + OBJ_43 /* Debug */, + OBJ_44 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = OBJ_1 /* Project object */; } From 684f364ec33ef482e5dfbbac715775fd2963bcc1 Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Thu, 15 Oct 2020 19:09:47 +0100 Subject: [PATCH 4/4] Make relevant types and members 'public'. --- Sources/NWWebSocket/Model/NWWebSocket.swift | 54 +++++++++---------- .../Protocol/WebSocketConnection.swift | 4 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Sources/NWWebSocket/Model/NWWebSocket.swift b/Sources/NWWebSocket/Model/NWWebSocket.swift index 06dffdc..ccf00ef 100644 --- a/Sources/NWWebSocket/Model/NWWebSocket.swift +++ b/Sources/NWWebSocket/Model/NWWebSocket.swift @@ -1,11 +1,18 @@ import Foundation import Network -open class NWWebSocket: WebSocketConnection { +public class NWWebSocket: WebSocketConnection { // MARK: - Public properties - weak var delegate: WebSocketConnectionDelegate? + public weak var delegate: WebSocketConnectionDelegate? + + public static var defaultOptions: NWProtocolWebSocket.Options { + let options = NWProtocolWebSocket.Options() + options.autoReplyPing = true + + return options + } // MARK: - Private properties @@ -16,29 +23,22 @@ open class NWWebSocket: WebSocketConnection { private var pingTimer: Timer? private var intentionalDisconnect: Bool = false - private static var options: NWProtocolWebSocket.Options { - let options = NWProtocolWebSocket.Options() - options.autoReplyPing = true - - return options - } - // MARK: - Initialization - convenience init(request: URLRequest, - connectAutomatically: Bool = false, - options: NWProtocolWebSocket.Options = NWWebSocket.options, - connectionQueue: DispatchQueue = .main) { + public convenience init(request: URLRequest, + connectAutomatically: Bool = false, + options: NWProtocolWebSocket.Options = NWWebSocket.defaultOptions, + connectionQueue: DispatchQueue = .main) { self.init(url: request.url!, connectAutomatically: connectAutomatically, connectionQueue: connectionQueue) } - init(url: URL, - connectAutomatically: Bool = false, - options: NWProtocolWebSocket.Options = NWWebSocket.options, - connectionQueue: DispatchQueue = .main) { + public init(url: URL, + connectAutomatically: Bool = false, + options: NWProtocolWebSocket.Options = NWWebSocket.defaultOptions, + connectionQueue: DispatchQueue = .main) { endpoint = .url(url) @@ -59,7 +59,7 @@ open class NWWebSocket: WebSocketConnection { // MARK: - WebSocketConnection conformance - func connect() { + public func connect() { if connection == nil { connection = NWConnection(to: endpoint, using: parameters) } @@ -69,7 +69,7 @@ open class NWWebSocket: WebSocketConnection { connection?.start(queue: connectionQueue) } - func send(string: String) { + public func send(string: String) { guard let data = string.data(using: .utf8) else { return } @@ -80,7 +80,7 @@ open class NWWebSocket: WebSocketConnection { send(data: data, context: context) } - func send(data: Data) { + public func send(data: Data) { let metadata = NWProtocolWebSocket.Metadata(opcode: .binary) let context = NWConnection.ContentContext(identifier: "binaryContext", metadata: [metadata]) @@ -88,7 +88,7 @@ open class NWWebSocket: WebSocketConnection { send(data: data, context: context) } - func listen() { + public func listen() { connection?.receiveMessage { [weak self] (data, context, _, error) in guard let self = self else { return @@ -109,7 +109,7 @@ open class NWWebSocket: WebSocketConnection { } } - func ping(interval: TimeInterval) { + public func ping(interval: TimeInterval) { pingTimer = .scheduledTimer(withTimeInterval: interval, repeats: true) { [weak self] _ in guard let self = self else { return @@ -120,7 +120,7 @@ open class NWWebSocket: WebSocketConnection { pingTimer?.tolerance = 0.01 } - func ping() { + public func ping() { let metadata = NWProtocolWebSocket.Metadata(opcode: .ping) metadata.setPongHandler(connectionQueue) { [weak self] error in guard let self = self else { @@ -140,7 +140,7 @@ open class NWWebSocket: WebSocketConnection { send(data: Data(), context: context) } - func disconnect(closeCode: NWProtocolWebSocket.CloseCode = .protocolCode(.normalClosure)) { + public func disconnect(closeCode: NWProtocolWebSocket.CloseCode = .protocolCode(.normalClosure)) { intentionalDisconnect = true // Call `cancel()` directly for a `normalClosure` @@ -226,7 +226,7 @@ open class NWWebSocket: WebSocketConnection { // If a connection closure was sent, inform delegate on completion if let socketMetadata = context.protocolMetadata.first as? NWProtocolWebSocket.Metadata, - socketMetadata.opcode == .close { + socketMetadata.opcode == .close { self.delegate?.webSocketDidDisconnect(connection: self, closeCode: socketMetadata.closeCode, reason: data) @@ -255,8 +255,8 @@ open class NWWebSocket: WebSocketConnection { /// - Returns: `true` if the error should be reported. private func shouldReportNWError(_ error: NWError) -> Bool { if case let .posix(code) = error, - code == .ENOTCONN || code == .ECANCELED, - intentionalDisconnect { + code == .ENOTCONN || code == .ECANCELED, + intentionalDisconnect { return false } else { return true diff --git a/Sources/NWWebSocket/Protocol/WebSocketConnection.swift b/Sources/NWWebSocket/Protocol/WebSocketConnection.swift index aa50cd6..0834b95 100644 --- a/Sources/NWWebSocket/Protocol/WebSocketConnection.swift +++ b/Sources/NWWebSocket/Protocol/WebSocketConnection.swift @@ -2,7 +2,7 @@ import Foundation import Network /// Defines a websocket connection. -protocol WebSocketConnection { +public protocol WebSocketConnection { /// Connect to the websocket. func connect() @@ -32,7 +32,7 @@ protocol WebSocketConnection { } /// Defines a delegate for a websocket connection. -protocol WebSocketConnectionDelegate: AnyObject { +public protocol WebSocketConnectionDelegate: AnyObject { /// Tells the delegate that the WebSocket did connect successfully. /// - Parameter connection: The active `WebSocketConnection`. func webSocketDidConnect(connection: WebSocketConnection)