diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..edc8a13 --- /dev/null +++ b/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. +import PackageDescription + +let package = Package( + name: "RxWebKit", + platforms: [ + .iOS(.v12) + ], + products: [ + .library(name: "RxWebKit", targets: ["RxWebKit"]) + ], + dependencies: [ + .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.0.0")), + .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "3.0.0")), + .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.0.0")) + ], + targets: [ + .target( + name: "RxWebKit", + dependencies: ["RxSwift", "RxCocoa", "RxRelay"], + path: "RxWebKit" + ), + .testTarget( + name: "RxWebKitTests", + dependencies: ["RxWebKit", "RxTest", "Nimble", "Quick"], + path: "RxWebKitTests" + ) + ], + swiftLanguageVersions: [.v5] +) diff --git a/RxWebKit.xcodeproj/project.pbxproj b/RxWebKit.xcodeproj/project.pbxproj index 65c9651..9446b3e 100644 --- a/RxWebKit.xcodeproj/project.pbxproj +++ b/RxWebKit.xcodeproj/project.pbxproj @@ -343,7 +343,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1020; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = MokuMokuCloud; TargetAttributes = { 42F426961C66200D001FED46 = { @@ -365,10 +365,9 @@ }; buildConfigurationList = 42F426921C66200D001FED46 /* Build configuration list for PBXProject "RxWebKit" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -512,6 +511,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -536,7 +536,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -568,6 +568,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -586,7 +587,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; @@ -604,7 +605,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = mokumoku.Example; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -623,7 +624,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = mokumoku.Example; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -648,7 +649,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/RxWebKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = mokumoku.RxWebKit; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -677,7 +678,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/RxWebKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = mokumoku.RxWebKit; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/RxWebKit.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/RxWebKit.xcodeproj/xcshareddata/xcschemes/Example.xcscheme index f1331ab..aff38dd 100644 --- a/RxWebKit.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ b/RxWebKit.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -39,17 +48,6 @@ - - - - - - - - - - - - + + - -