From 4f70b83a63e4dfc59ec1d3fd632788eb31069134 Mon Sep 17 00:00:00 2001 From: Shai Mishali Date: Tue, 8 Feb 2022 18:16:39 +0200 Subject: [PATCH] RxWebKit 2.0.1 w/ SPM Support --- .../contents.xcworkspacedata | 7 +++++++ Package.resolved | 16 +++++++++++++++ Package.swift | 20 +++++++++++++++++++ RxWebKit.podspec | 6 +++--- {RxWebKit => Sources}/Info.plist | 0 {RxWebKit => Sources}/RxWebKit.h | 0 .../RxWebKit}/Rx+WebKit.swift | 0 .../RxWKNavigationDelegateProxy.swift | 0 .../RxWebKit}/RxWKUIDelegateEvents+Rx.swift | 0 .../RxWebKit}/RxWKUIDelegateProxy.swift | 0 .../RxWebKit}/RxWKUserContentController.swift | 0 .../WKNavigationDelegateEvents+Rx.swift | 0 12 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 Package.resolved create mode 100644 Package.swift rename {RxWebKit => Sources}/Info.plist (100%) rename {RxWebKit => Sources}/RxWebKit.h (100%) rename {RxWebKit/Sources => Sources/RxWebKit}/Rx+WebKit.swift (100%) rename {RxWebKit/Sources => Sources/RxWebKit}/RxWKNavigationDelegateProxy.swift (100%) rename {RxWebKit/Sources => Sources/RxWebKit}/RxWKUIDelegateEvents+Rx.swift (100%) rename {RxWebKit/Sources => Sources/RxWebKit}/RxWKUIDelegateProxy.swift (100%) rename {RxWebKit/Sources => Sources/RxWebKit}/RxWKUserContentController.swift (100%) rename {RxWebKit/Sources => Sources/RxWebKit}/WKNavigationDelegateEvents+Rx.swift (100%) diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..a785239 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "RxSwift", + "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", + "state": { + "branch": null, + "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8", + "version": "6.5.0" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..da83c65 --- /dev/null +++ b/Package.swift @@ -0,0 +1,20 @@ +// swift-tools-version:5.0 +import PackageDescription + +let package = Package( + name: "RxWebKit", + platforms: [.iOS(.v9), .macOS(.v10_13)], + products: [ + .library(name: "RxWebKit", targets: ["RxWebKit"]) + ], + dependencies: [ + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")) + ], + targets: [ + .target( + name: "RxWebKit", + dependencies: ["RxSwift", "RxCocoa"] + ) + ], + swiftLanguageVersions: [.v5] +) diff --git a/RxWebKit.podspec b/RxWebKit.podspec index 553a330..780e614 100644 --- a/RxWebKit.podspec +++ b/RxWebKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxWebKit" - s.version = "2.0.0" + s.version = "2.0.1" s.summary = "RxWebKit is a RxSwift wrapper for WebKit." s.description = <<-DESC RxWebKit is a RxSwift wrapper for `WebKit`. @@ -34,8 +34,8 @@ Pod::Spec.new do |s| "RxSwift Community" => "community@rxswift.org" } s.source = { :git => "https://github.com/RxSwiftCommunity/RxWebKit.git", :tag => s.version.to_s } - s.source_files = "RxWebKit/Sources/**/*.{swift}" - s.exclude_files = "RxWebKit/Sources/**/*.{plist}" + s.source_files = "Sources/RxWebKit/**/*.{swift}" + s.exclude_files = "Sources/RxWebKit/**/*.{plist}" s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.13' s.swift_version = '5.0' diff --git a/RxWebKit/Info.plist b/Sources/Info.plist similarity index 100% rename from RxWebKit/Info.plist rename to Sources/Info.plist diff --git a/RxWebKit/RxWebKit.h b/Sources/RxWebKit.h similarity index 100% rename from RxWebKit/RxWebKit.h rename to Sources/RxWebKit.h diff --git a/RxWebKit/Sources/Rx+WebKit.swift b/Sources/RxWebKit/Rx+WebKit.swift similarity index 100% rename from RxWebKit/Sources/Rx+WebKit.swift rename to Sources/RxWebKit/Rx+WebKit.swift diff --git a/RxWebKit/Sources/RxWKNavigationDelegateProxy.swift b/Sources/RxWebKit/RxWKNavigationDelegateProxy.swift similarity index 100% rename from RxWebKit/Sources/RxWKNavigationDelegateProxy.swift rename to Sources/RxWebKit/RxWKNavigationDelegateProxy.swift diff --git a/RxWebKit/Sources/RxWKUIDelegateEvents+Rx.swift b/Sources/RxWebKit/RxWKUIDelegateEvents+Rx.swift similarity index 100% rename from RxWebKit/Sources/RxWKUIDelegateEvents+Rx.swift rename to Sources/RxWebKit/RxWKUIDelegateEvents+Rx.swift diff --git a/RxWebKit/Sources/RxWKUIDelegateProxy.swift b/Sources/RxWebKit/RxWKUIDelegateProxy.swift similarity index 100% rename from RxWebKit/Sources/RxWKUIDelegateProxy.swift rename to Sources/RxWebKit/RxWKUIDelegateProxy.swift diff --git a/RxWebKit/Sources/RxWKUserContentController.swift b/Sources/RxWebKit/RxWKUserContentController.swift similarity index 100% rename from RxWebKit/Sources/RxWKUserContentController.swift rename to Sources/RxWebKit/RxWKUserContentController.swift diff --git a/RxWebKit/Sources/WKNavigationDelegateEvents+Rx.swift b/Sources/RxWebKit/WKNavigationDelegateEvents+Rx.swift similarity index 100% rename from RxWebKit/Sources/WKNavigationDelegateEvents+Rx.swift rename to Sources/RxWebKit/WKNavigationDelegateEvents+Rx.swift