From c41a4088d838f306c56145e4ef738dcd0631d15e Mon Sep 17 00:00:00 2001 From: Damien Dorizy Date: Tue, 2 Jul 2019 10:38:30 +0200 Subject: [PATCH 1/5] Added Swift Package Manager manifest --- Package.swift | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..8b64775 --- /dev/null +++ b/Package.swift @@ -0,0 +1,16 @@ +// 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", + products: [ + .library(name: "RxWebKit", targets: ["RxWebKit"]) + ], + dependencies: [ + .package(url: "https://github.com/ReactiveX/RxSwift", from: "4.5.0") + ], + targets: [ + .target(name: "RxWebKit", dependencies: ["RxSwift", "RxCocoa"], path: "RxWebKit") + ] +) From e8d2fc258eca875d0a6aa8da4c2686a7a19cb5de Mon Sep 17 00:00:00 2001 From: Damien Dorizy Date: Mon, 22 Jul 2019 16:44:00 +0200 Subject: [PATCH 2/5] Updated required version of Rxswift to 5.0.1 --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 8b64775..0572462 100644 --- a/Package.swift +++ b/Package.swift @@ -8,7 +8,7 @@ let package = Package( .library(name: "RxWebKit", targets: ["RxWebKit"]) ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift", from: "4.5.0") + .package(url: "https://github.com/ReactiveX/RxSwift", from: "5.0.1") ], targets: [ .target(name: "RxWebKit", dependencies: ["RxSwift", "RxCocoa"], path: "RxWebKit") From fe96e61875a8da530aa4321801b6c8546795b7c5 Mon Sep 17 00:00:00 2001 From: Taishi Ikai Date: Fri, 14 Feb 2020 14:46:27 +0900 Subject: [PATCH 3/5] Update Package.swift --- Package.swift | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 0572462..3a7ac19 100644 --- a/Package.swift +++ b/Package.swift @@ -4,13 +4,28 @@ import PackageDescription let package = Package( name: "RxWebKit", + platforms: [ + .iOS(.v8) + ], products: [ .library(name: "RxWebKit", targets: ["RxWebKit"]) ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift", from: "5.0.1") + .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "5.0.0")), + .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "2.2.0")), + .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.0")) ], targets: [ - .target(name: "RxWebKit", dependencies: ["RxSwift", "RxCocoa"], path: "RxWebKit") - ] + .target( + name: "RxWebKit", + dependencies: ["RxSwift", "RxCocoa", "RxRelay"], + path: "RxWebKit" + ), + .testTarget( + name: "RxWebKitTests", + dependencies: ["RxWebKit", "Nimble", "Quick"], + path: "RxWebKitTests" + ) + ], + swiftLanguageVersions: [.v5] ) From 5ce87d318ee63edb1bc0aef439e239eb6b78a18e Mon Sep 17 00:00:00 2001 From: Taishi Ikai Date: Fri, 26 Mar 2021 12:57:20 +0900 Subject: [PATCH 4/5] Update xcodeproj --- RxWebKit.xcodeproj/project.pbxproj | 19 ++++++++------- .../xcshareddata/xcschemes/Example.xcscheme | 24 ++++++++----------- .../xcshareddata/xcschemes/RxWebKit.xcscheme | 10 +++----- 3 files changed, 23 insertions(+), 30 deletions(-) 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 @@ - - - - - - - - - - - - + + - - Date: Fri, 26 Mar 2021 16:07:11 +0900 Subject: [PATCH 5/5] Updated required version of Rxswift to 6.0.0 (#1) --- Package.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index 3a7ac19..edc8a13 100644 --- a/Package.swift +++ b/Package.swift @@ -5,15 +5,15 @@ import PackageDescription let package = Package( name: "RxWebKit", platforms: [ - .iOS(.v8) + .iOS(.v12) ], products: [ .library(name: "RxWebKit", targets: ["RxWebKit"]) ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "5.0.0")), - .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "2.2.0")), - .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.0")) + .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( @@ -23,7 +23,7 @@ let package = Package( ), .testTarget( name: "RxWebKitTests", - dependencies: ["RxWebKit", "Nimble", "Quick"], + dependencies: ["RxWebKit", "RxTest", "Nimble", "Quick"], path: "RxWebKitTests" ) ],