diff --git a/.gitignore b/.gitignore index 980e088..5a92203 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ Package.resolved .DS_Store **/.idea/** +RxWebKit-SPM.xcodeproj \ No newline at end of file diff --git a/RxWebKit-SPM.xcodeproj/project.pbxproj b/RxWebKit-SPM.xcodeproj/project.pbxproj deleted file mode 100644 index f231332..0000000 --- a/RxWebKit-SPM.xcodeproj/project.pbxproj +++ /dev/null @@ -1,490 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 51; - objects = { - -/* Begin PBXBuildFile section */ - 2AF5E5C1AAE410379CD2DDA6 /* RxWKNavigationDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 355F370ACDE4A0E7C094AA71 /* RxWKNavigationDelegateProxy.swift */; }; - 3D8E9564FD514BCDB199B59F /* Rx+WebKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E4BF2645F4DA16F6C3A09B /* Rx+WebKit.swift */; }; - 4B4885512AA3FED0E75BCBEC /* RxWKUIDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EA43A54D10F90AA6334D00 /* RxWKUIDelegateProxy.swift */; }; - 4BC06ACB442F19339A1C4F1F /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = B399E6E6C0C152B3D942AA8D /* RxCocoa */; }; - 5286580D7418D360B5AD11EA /* RxWKNavigationDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 355F370ACDE4A0E7C094AA71 /* RxWKNavigationDelegateProxy.swift */; }; - 6129D3DAA278C3AED14C6AA7 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 0D414270C7F226BB4D04CBEF /* RxSwift */; }; - 81EAF2858F312490286836F3 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 4F0749E63C85833D16756C86 /* RxCocoa */; }; - 9185D7193C1AC65E62B812EF /* RxWKUIDelegateEvents+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83A5D041F5DC44E8D852107D /* RxWKUIDelegateEvents+Rx.swift */; }; - AA6FF0AD525A4A8B2ED9B81F /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 2BF98EA101066090926134AC /* RxSwift */; }; - B42D563F4268AF3D7D05F4AB /* RxWKUIDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EA43A54D10F90AA6334D00 /* RxWKUIDelegateProxy.swift */; }; - B53BF49B52902067D13E1E75 /* RxWKUserContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E611F37E8B2DA42BB37F32D4 /* RxWKUserContentController.swift */; }; - C8654073606E5D1D20760D4F /* Rx+WebKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E4BF2645F4DA16F6C3A09B /* Rx+WebKit.swift */; }; - DD83016D41627D8198F3BB4C /* RxWKUserContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E611F37E8B2DA42BB37F32D4 /* RxWKUserContentController.swift */; }; - E4CFAA7FAF8BFCFB64CE00D5 /* RxWKUIDelegateEvents+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83A5D041F5DC44E8D852107D /* RxWKUIDelegateEvents+Rx.swift */; }; - F33708779E10DEB9ED74847C /* WKNavigationDelegateEvents+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB45C5B1DFE81520EFA119C9 /* WKNavigationDelegateEvents+Rx.swift */; }; - FD81E26507C6BDBA7947CBCE /* WKNavigationDelegateEvents+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB45C5B1DFE81520EFA119C9 /* WKNavigationDelegateEvents+Rx.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 05ACA5A816188BC246F00C96 /* RxWebKit iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "RxWebKit iOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 18653A3B596D02AF9E7179AE /* RxWebKit macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "RxWebKit macOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 355F370ACDE4A0E7C094AA71 /* RxWKNavigationDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxWKNavigationDelegateProxy.swift; sourceTree = ""; }; - 39E4BF2645F4DA16F6C3A09B /* Rx+WebKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Rx+WebKit.swift"; sourceTree = ""; }; - 51EA43A54D10F90AA6334D00 /* RxWKUIDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxWKUIDelegateProxy.swift; sourceTree = ""; }; - 83A5D041F5DC44E8D852107D /* RxWKUIDelegateEvents+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RxWKUIDelegateEvents+Rx.swift"; sourceTree = ""; }; - BB45C5B1DFE81520EFA119C9 /* WKNavigationDelegateEvents+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WKNavigationDelegateEvents+Rx.swift"; sourceTree = ""; }; - E611F37E8B2DA42BB37F32D4 /* RxWKUserContentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxWKUserContentController.swift; sourceTree = ""; }; - F372680461F993CD3146BA3F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - D0704584CF9FE7C97F405A22 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - AA6FF0AD525A4A8B2ED9B81F /* RxSwift in Frameworks */, - 4BC06ACB442F19339A1C4F1F /* RxCocoa in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - FC8DC4B133237D761213F09A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 6129D3DAA278C3AED14C6AA7 /* RxSwift in Frameworks */, - 81EAF2858F312490286836F3 /* RxCocoa in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 472C0A74A7F3BA0C20383718 = { - isa = PBXGroup; - children = ( - E68115803DDC9DCE4686DDC7 /* RxWebKit */, - 813FBA0A4B363183BDE913A2 /* Products */, - ); - indentWidth = 2; - sourceTree = ""; - tabWidth = 2; - usesTabs = 0; - }; - 813FBA0A4B363183BDE913A2 /* Products */ = { - isa = PBXGroup; - children = ( - 05ACA5A816188BC246F00C96 /* RxWebKit iOS.framework */, - 18653A3B596D02AF9E7179AE /* RxWebKit macOS.framework */, - ); - name = Products; - sourceTree = ""; - }; - E68115803DDC9DCE4686DDC7 /* RxWebKit */ = { - isa = PBXGroup; - children = ( - F372680461F993CD3146BA3F /* Info.plist */, - 39E4BF2645F4DA16F6C3A09B /* Rx+WebKit.swift */, - 355F370ACDE4A0E7C094AA71 /* RxWKNavigationDelegateProxy.swift */, - 83A5D041F5DC44E8D852107D /* RxWKUIDelegateEvents+Rx.swift */, - 51EA43A54D10F90AA6334D00 /* RxWKUIDelegateProxy.swift */, - E611F37E8B2DA42BB37F32D4 /* RxWKUserContentController.swift */, - BB45C5B1DFE81520EFA119C9 /* WKNavigationDelegateEvents+Rx.swift */, - ); - name = RxWebKit; - path = Sources/RxWebKit; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 0EF09E516FCAE98F63119C07 /* RxWebKit macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = A611BD25B1DBC4DF41839A15 /* Build configuration list for PBXNativeTarget "RxWebKit macOS" */; - buildPhases = ( - 4D36D5F861CEAD7E6E9B828F /* Sources */, - D0704584CF9FE7C97F405A22 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "RxWebKit macOS"; - packageProductDependencies = ( - 2BF98EA101066090926134AC /* RxSwift */, - B399E6E6C0C152B3D942AA8D /* RxCocoa */, - ); - productName = "RxWebKit macOS"; - productReference = 18653A3B596D02AF9E7179AE /* RxWebKit macOS.framework */; - productType = "com.apple.product-type.framework"; - }; - 8244E94F12163FDA55A9E34C /* RxWebKit iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1EE8D637BD09EBDD16E6D044 /* Build configuration list for PBXNativeTarget "RxWebKit iOS" */; - buildPhases = ( - 0E15B655FBE4769B059DA071 /* Sources */, - FC8DC4B133237D761213F09A /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "RxWebKit iOS"; - packageProductDependencies = ( - 0D414270C7F226BB4D04CBEF /* RxSwift */, - 4F0749E63C85833D16756C86 /* RxCocoa */, - ); - productName = "RxWebKit iOS"; - productReference = 05ACA5A816188BC246F00C96 /* RxWebKit iOS.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E3B3D8074BB4F63DEDBE4EDF /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1230; - ORGANIZATIONNAME = RxSwiftCommunity; - TargetAttributes = { - }; - }; - buildConfigurationList = F47F04A724E82446E43E1303 /* Build configuration list for PBXProject "RxWebKit-SPM" */; - compatibilityVersion = "Xcode 10.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - Base, - en, - ); - mainGroup = 472C0A74A7F3BA0C20383718; - packageReferences = ( - 426C098B10AC50681D2B2797 /* XCRemoteSwiftPackageReference "RxSwift" */, - ); - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8244E94F12163FDA55A9E34C /* RxWebKit iOS */, - 0EF09E516FCAE98F63119C07 /* RxWebKit macOS */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 0E15B655FBE4769B059DA071 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3D8E9564FD514BCDB199B59F /* Rx+WebKit.swift in Sources */, - 5286580D7418D360B5AD11EA /* RxWKNavigationDelegateProxy.swift in Sources */, - E4CFAA7FAF8BFCFB64CE00D5 /* RxWKUIDelegateEvents+Rx.swift in Sources */, - 4B4885512AA3FED0E75BCBEC /* RxWKUIDelegateProxy.swift in Sources */, - B53BF49B52902067D13E1E75 /* RxWKUserContentController.swift in Sources */, - F33708779E10DEB9ED74847C /* WKNavigationDelegateEvents+Rx.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4D36D5F861CEAD7E6E9B828F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C8654073606E5D1D20760D4F /* Rx+WebKit.swift in Sources */, - 2AF5E5C1AAE410379CD2DDA6 /* RxWKNavigationDelegateProxy.swift in Sources */, - 9185D7193C1AC65E62B812EF /* RxWKUIDelegateEvents+Rx.swift in Sources */, - B42D563F4268AF3D7D05F4AB /* RxWKUIDelegateProxy.swift in Sources */, - DD83016D41627D8198F3BB4C /* RxWKUserContentController.swift in Sources */, - FD81E26507C6BDBA7947CBCE /* WKNavigationDelegateEvents+Rx.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 18F9D5B8D84295AF8795649D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "DEBUG=1", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 384930D7BB7EA5AF0CA7D3B3 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUILD_LIBRARY_FOR_DISTRIBUTION = YES; - CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/RxWebKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "RxSwiftCommunity.RxWebKit.RxWebKit-iOS"; - PRODUCT_NAME = RxWebKit; - SDKROOT = iphoneos; - SKIP_INSTALL = NO; - SUPPORTS_MACCATALYST = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 5610C5F10D44EC7457D7FAF5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; - 7D46CEF046423D31382A1931 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUILD_LIBRARY_FOR_DISTRIBUTION = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/RxWebKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "RxSwiftCommunity.RxWebKit.RxWebKit-macOS"; - PRODUCT_NAME = RxWebKit; - SDKROOT = macosx; - SKIP_INSTALL = NO; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; - ADFC451BF97B7BFE4DBA122D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUILD_LIBRARY_FOR_DISTRIBUTION = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/RxWebKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "RxSwiftCommunity.RxWebKit.RxWebKit-macOS"; - PRODUCT_NAME = RxWebKit; - SDKROOT = macosx; - SKIP_INSTALL = NO; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - BFAF0956A5D85CE61127750E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUILD_LIBRARY_FOR_DISTRIBUTION = YES; - CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/RxWebKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "RxSwiftCommunity.RxWebKit.RxWebKit-iOS"; - PRODUCT_NAME = RxWebKit; - SDKROOT = iphoneos; - SKIP_INSTALL = NO; - SUPPORTS_MACCATALYST = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1EE8D637BD09EBDD16E6D044 /* Build configuration list for PBXNativeTarget "RxWebKit iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 384930D7BB7EA5AF0CA7D3B3 /* Debug */, - BFAF0956A5D85CE61127750E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - A611BD25B1DBC4DF41839A15 /* Build configuration list for PBXNativeTarget "RxWebKit macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - ADFC451BF97B7BFE4DBA122D /* Debug */, - 7D46CEF046423D31382A1931 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - F47F04A724E82446E43E1303 /* Build configuration list for PBXProject "RxWebKit-SPM" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 18F9D5B8D84295AF8795649D /* Debug */, - 5610C5F10D44EC7457D7FAF5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 426C098B10AC50681D2B2797 /* XCRemoteSwiftPackageReference "RxSwift" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/ReactiveX/RxSwift.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 6.0.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 0D414270C7F226BB4D04CBEF /* RxSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 426C098B10AC50681D2B2797 /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxSwift; - }; - 2BF98EA101066090926134AC /* RxSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 426C098B10AC50681D2B2797 /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxSwift; - }; - 4F0749E63C85833D16756C86 /* RxCocoa */ = { - isa = XCSwiftPackageProductDependency; - package = 426C098B10AC50681D2B2797 /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxCocoa; - }; - B399E6E6C0C152B3D942AA8D /* RxCocoa */ = { - isa = XCSwiftPackageProductDependency; - package = 426C098B10AC50681D2B2797 /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxCocoa; - }; -/* End XCSwiftPackageProductDependency section */ - }; - rootObject = E3B3D8074BB4F63DEDBE4EDF /* Project object */; -} diff --git a/RxWebKit-SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/RxWebKit-SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 7596ea3..0000000 --- a/RxWebKit-SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/RxWebKit-SPM.xcodeproj/xcshareddata/xcschemes/RxWebKit iOS.xcscheme b/RxWebKit-SPM.xcodeproj/xcshareddata/xcschemes/RxWebKit iOS.xcscheme deleted file mode 100644 index 817ff9f..0000000 --- a/RxWebKit-SPM.xcodeproj/xcshareddata/xcschemes/RxWebKit iOS.xcscheme +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/RxWebKit-SPM.xcodeproj/xcshareddata/xcschemes/RxWebKit macOS.xcscheme b/RxWebKit-SPM.xcodeproj/xcshareddata/xcschemes/RxWebKit macOS.xcscheme deleted file mode 100644 index 75073a5..0000000 --- a/RxWebKit-SPM.xcodeproj/xcshareddata/xcschemes/RxWebKit macOS.xcscheme +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cleanup.sh b/cleanup.sh index f1fdbff..02fe948 100755 --- a/cleanup.sh +++ b/cleanup.sh @@ -16,7 +16,6 @@ exit 1 fi if which xcodegen >/dev/null; then -`which xcodegen` --spec project-spm.yml `which xcodegen` --spec project-carthage.yml else echo "error: XcodeGen not installed, do `sh setup.sh` to install XcodeGen." diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index d1c346c..e322781 100644 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -8,4 +8,6 @@ echo "RELEASE_VERSION=$(git describe --abbrev=0 | tr -d '\n')" >> $GITHUB_ENV export VERSION="$(git describe --abbrev=0 | tr -d '\n')" VERSION=${VERSION:1} echo $VERSION -npx podspec-bump -w -i "$VERSION" \ No newline at end of file +npx podspec-bump -w -i "$VERSION" +git add -A +git commit --amend --no-edit \ No newline at end of file diff --git a/scripts/xcframeworks.sh b/scripts/xcframeworks.sh index 9d511fd..2ebf0c8 100644 --- a/scripts/xcframeworks.sh +++ b/scripts/xcframeworks.sh @@ -1,12 +1,14 @@ -#!/usr/bin/env bash - set -euo pipefail +rm -rf RxWebKit-SPM.xcodeproj rm -rf xcarchives/* rm -rf RxWebKit.xcframework.zip +rm -rf RxWebKit.xcframework + +xcodegen --spec project-spm.yml -xcodebuild archive -quiet -project RxWebKit-SPM.xcodeproj -scheme "RxWebKit iOS" -sdk iphoneos -archivePath "xcarchives/RxWebKit-iOS" -xcodebuild archive -quiet -project RxWebKit-SPM.xcodeproj -scheme "RxWebKit iOS" -sdk iphonesimulator -archivePath "xcarchives/RxWebKit-iOS-Simulator" -xcodebuild archive -quiet -project RxWebKit-SPM.xcodeproj -scheme "RxWebKit macOS" -sdk macosx -archivePath "xcarchives/RxWebKit-macOS" +xcodebuild archive -quiet -project RxWebKit-SPM.xcodeproj -configuration Release -scheme "RxWebKit iOS" -destination "generic/platform=iOS" -archivePath "xcarchives/RxWebKit-iOS" SKIP_INSTALL=NO SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE="bitcode" ENABLE_BITCODE=YES | xcpretty --color --simple +xcodebuild archive -quiet -project RxWebKit-SPM.xcodeproj -configuration Release -scheme "RxWebKit iOS" -destination "generic/platform=iOS Simulator" -archivePath "xcarchives/RxWebKit-iOS-Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE="bitcode" ENABLE_BITCODE=YES | xcpretty --color --simple +xcodebuild archive -quiet -project RxWebKit-SPM.xcodeproj -configuration Release -scheme "RxWebKit macOS" -destination "generic/platform=macOS" -archivePath "xcarchives/RxWebKit-macOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE="bitcode" ENABLE_BITCODE=YES | xcpretty --color --simple xcodebuild -create-xcframework \ -framework "xcarchives/RxWebKit-iOS-Simulator.xcarchive/Products/Library/Frameworks/RxWebKit.framework" \ @@ -19,4 +21,5 @@ xcodebuild -create-xcframework \ zip -r RxWebKit.xcframework.zip RxWebKit.xcframework rm -rf xcarchives/* -rm -rf RxWebKit.xcframework \ No newline at end of file +rm -rf RxWebKit.xcframework +rm -rf RxWebKit-SPM.xcodeproj \ No newline at end of file