From 8466e95d740b59eaffc215c0f2d0eaf0287ee42a Mon Sep 17 00:00:00 2001 From: foxware00 Date: Mon, 2 Sep 2019 09:43:11 +0100 Subject: [PATCH 1/3] Fix for block on main thread when using supplementary nodes --- RxASDataSources.podspec | 2 +- .../ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RxASDataSources.podspec b/RxASDataSources.podspec index 20f96c3..bd565e0 100644 --- a/RxASDataSources.podspec +++ b/RxASDataSources.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RxASDataSources' - s.version = '0.3.4' + s.version = '0.3.5' s.license = { :type => "MIT", :file => "LICENSE" } s.summary = 'RxDataSources for AsyncDisplayKit/Texture supports ASTableNode/ASCollectionNode' s.homepage = 'https://github.com/RxSwiftCommunity/RxASDataSources' diff --git a/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift b/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift index 010f705..74b98d2 100644 --- a/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift +++ b/Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift @@ -36,7 +36,8 @@ open class ASCollectionSectionedDataSource: NSObject, ASCol fileprivate static func configureSupplementaryViewBlockNotSet(dataSource: ASCollectionSectionedDataSource, node: ASCollectionNode, nodeForSupplementaryElementOfKind kind: String, indexPath: IndexPath) -> ASCellNodeBlock { // Users expect collectionNode(_nodeForSupplementaryElementOfKind:at:) will be executed in main thread according to api doc. - return { DispatchQueue.main.sync(execute: { dataSource.collectionNode(node, nodeForSupplementaryElementOfKind: kind, at: indexPath) }) } + let cellNode = dataSource.collectionNode(node, nodeForSupplementaryElementOfKind: kind, at: indexPath) + return { cellNode } } public init( From 3a818f7d36c20c39df039ba0e0448599659f2305 Mon Sep 17 00:00:00 2001 From: foxware00 Date: Mon, 2 Sep 2019 09:46:20 +0100 Subject: [PATCH 2/3] 0.4.1 --- RxASDataSources.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RxASDataSources.podspec b/RxASDataSources.podspec index bd565e0..ecdc384 100644 --- a/RxASDataSources.podspec +++ b/RxASDataSources.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RxASDataSources' - s.version = '0.3.5' + s.version = '0.4.1' s.license = { :type => "MIT", :file => "LICENSE" } s.summary = 'RxDataSources for AsyncDisplayKit/Texture supports ASTableNode/ASCollectionNode' s.homepage = 'https://github.com/RxSwiftCommunity/RxASDataSources' From 5f7770352a5ade718e579d26a9e13e15e01b12d9 Mon Sep 17 00:00:00 2001 From: foxware00 Date: Mon, 2 Sep 2019 10:26:26 +0100 Subject: [PATCH 3/3] 0.4.1 --- .swift-version | 1 - Readme.md | 11 ++++++----- RxASDataSources.podspec | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d54..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 diff --git a/Readme.md b/Readme.md index f75081d..5b8e250 100644 --- a/Readme.md +++ b/Readme.md @@ -1,3 +1,4 @@ + ## RxASDataSources [![Platforms](https://img.shields.io/cocoapods/p/RxASDataSources.svg)](https://cocoapods.org/pods/RxASDataSources) @@ -12,8 +13,8 @@ - [Features](#features) - [Requirements](#requirements) - [Installation](#installation) - - [CocoaPods](#cocoapods) - - [Carthage](#carthage) + - [CocoaPods](#cocoapods) + - [Carthage](#carthage) - [Usage](#usage) - [License](#license) @@ -27,9 +28,9 @@ ## Requirements -- iOS 8.0+ -- Xcode 9.0+ -- RxSwift 4.0 & Texture 2.5 +- iOS 9.0+ +- Xcode 10.1+ +- RxSwift 5.0 & Texture 2.8 ## Installation diff --git a/RxASDataSources.podspec b/RxASDataSources.podspec index ecdc384..041a947 100644 --- a/RxASDataSources.podspec +++ b/RxASDataSources.podspec @@ -8,9 +8,9 @@ Pod::Spec.new do |s| s.authors = { "Dang Thai Son" => "dangthaison.91@gmail.com" } s.source = { :git => "https://github.com/RxSwiftCommunity/RxASDataSources.git", :tag => s.version.to_s } - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '9.0' s.requires_arc = true - s.swift_version = '5.0' + s.swift_versions = '5.0' s.source_files = "Sources/**/*.swift" s.framework = "Foundation"