Skip to content

Commit

Permalink
RxNuke 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kean committed May 20, 2020
1 parent c1da34c commit ab5ffd4
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 29 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
[Changelog](https://github.com/kean/RxNuke/releases) for all versions

## RxNuke 0.13.0

- Update to Nuke 9
- Bump minimum platform version requirements. The minimum iOS version is now iOS 11 which is a 64-bit only system. This is great news if you are installing your dependencies using Carthage as Nuke is now going to compile twice as fast: no need to compile for `i386` and `armv7` anymore.

## RxNuke 0.12.0

- Increase the minimum requirred RxSwift version to 5.1 - the version with hard-deprecated `UIWebView` APIs removed
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "kean/Nuke" ~> 8.0
github "kean/Nuke" ~> 9.0.0
github "ReactiveX/RxSwift" ~> 5.1.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveX/RxSwift" "5.1.0"
github "kean/Nuke" "8.0.1"
github "ReactiveX/RxSwift" "5.1.1"
github "kean/Nuke" "8.4.1"
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/kean/Nuke.git",
"state": {
"branch": null,
"revision": "58543e405a5c7640d08109faf0e2060d9e9b44dd",
"version": "8.1.1"
"revision": "e901272a7cc5a28734d4f196d543edcf7efd8f4c",
"version": "9.0.0"
}
},
{
Expand Down
10 changes: 5 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import PackageDescription
let package = Package(
name: "RxNuke",
platforms: [
.macOS(.v10_12),
.iOS(.v10),
.tvOS(.v10),
.watchOS(.v3)
.macOS(.v10_13),
.iOS(.v11),
.tvOS(.v11),
.watchOS(.v4)
],
products: [
.library(name: "RxNuke", targets: ["RxNuke"]),
],
dependencies: [
.package(
url: "https://github.com/kean/Nuke.git",
from: "8.0.0"
from: "9.0.0"
),
.package(
url: "https://github.com/ReactiveX/RxSwift.git",
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ final class ImageCell: UICollectionViewCell {

| RxNuke | Swift | Xcode | Platforms |
|------------------|-----------------------|----------------------|----------------------------------------------------|
| RxNuke 1.0 | Swift 5.1 | Xcode 11.0 | iOS 11.0 / watchOS 4.0 / macOS 10.13 / tvOS 11.0 |
| RxNuke 0.8 | Swift 4.25.0 | Xcode 10.110.2 | iOS 10.0 / watchOS 3.0 / macOS 10.12 / tvOS 10.0 |
| RxNuke 0.7 | Swift 4.04.2 | Xcode 9.210.1 | iOS 9.0 / watchOS 2.0 / macOS 10.10 / tvOS 9.0 |

Expand Down
12 changes: 6 additions & 6 deletions RxNuke.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxNuke'
s.version = '0.12.0'
s.version = '0.13.0'
s.summary = 'RxSwift extensions for Nuke'

s.homepage = 'https://github.com/kean/RxNuke'
Expand All @@ -9,14 +9,14 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/kean/RxNuke.git', :tag => s.version.to_s }
s.social_media_url = 'https://twitter.com/a_grebenyuk'

s.ios.deployment_target = '10.0'
s.watchos.deployment_target = '3.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.ios.deployment_target = '11.0'
s.watchos.deployment_target = '4.0'
s.osx.deployment_target = '10.13'
s.tvos.deployment_target = '11.0'

s.module_name = "RxNuke"

s.dependency 'Nuke', '~> 8.0'
s.dependency 'Nuke', '~> 9.0'
s.dependency 'RxSwift', '~> 5.1.0'

s.source_files = 'Source/**/*'
Expand Down
4 changes: 2 additions & 2 deletions RxNuke.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 0.12.0;
MARKETING_VERSION = 0.13.0;
PRODUCT_BUNDLE_IDENTIFIER = com.github.kean.RxNuke;
PRODUCT_NAME = RxNuke;
SKIP_INSTALL = YES;
Expand All @@ -339,7 +339,7 @@
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 0.12.0;
MARKETING_VERSION = 0.13.0;
PRODUCT_BUNDLE_IDENTIFIER = com.github.kean.RxNuke;
PRODUCT_NAME = RxNuke;
SKIP_INSTALL = YES;
Expand Down
9 changes: 2 additions & 7 deletions Source/RxNuke.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public extension Reactive where Base: ImagePipeline {
/// image was found in memory cache.
func loadImage(with request: ImageRequest) -> Single<ImageResponse> {
return Single<ImageResponse>.create { single in
if let image = self.cachedResponse(for: request) {
single(.success(image)) // return synchronously
if let image = self.base.cachedImage(for: request) {
single(.success(ImageResponse(container: image))) // return synchronously
return Disposables.create() // nop
} else {
let task = self.base.loadImage(with: request) { result in
Expand All @@ -40,9 +40,4 @@ public extension Reactive where Base: ImagePipeline {
}
}
}

private func cachedResponse(for request: ImageRequest) -> ImageResponse? {
guard request.options.memoryCacheOptions.isReadAllowed else { return nil }
return base.configuration.imageCache?.cachedResponse(for: request)
}
}
8 changes: 4 additions & 4 deletions Supporting Files/RxNuke.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ SUPPORTED_PLATFORMS = iphoneos macosx appletvos watchos iphonesimulator appletvs

SWIFT_VERSION = 5.0

IPHONEOS_DEPLOYMENT_TARGET = 10.0
MACOSX_DEPLOYMENT_TARGET = 10.12
TVOS_DEPLOYMENT_TARGET = 10.0
WATCHOS_DEPLOYMENT_TARGET = 3.0
IPHONEOS_DEPLOYMENT_TARGET = 11.0
MACOSX_DEPLOYMENT_TARGET = 10.13
TVOS_DEPLOYMENT_TARGET = 11.0
WATCHOS_DEPLOYMENT_TARGET = 4.0

FRAMEWORK_SEARCH_PATHS[sdk=appletvos*] = $(PROJECT_DIR)/Carthage/Build/tvOS
FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*] = $(PROJECT_DIR)/Carthage/Build/tvOS
Expand Down

0 comments on commit ab5ffd4

Please sign in to comment.