Skip to content

Commit 0e6eea7

Browse files
foxware00dangthaison91
authored andcommitted
Deadlock on supplementary nodes (#36)
* Fix for block on main thread when using supplementary nodes * 0.4.1 * 0.4.1
1 parent 326754a commit 0e6eea7

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

.swift-version

-1
This file was deleted.

Readme.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
## RxASDataSources
23

34
[![Platforms](https://img.shields.io/cocoapods/p/RxASDataSources.svg)](https://cocoapods.org/pods/RxASDataSources)
@@ -12,8 +13,8 @@
1213
- [Features](#features)
1314
- [Requirements](#requirements)
1415
- [Installation](#installation)
15-
- [CocoaPods](#cocoapods)
16-
- [Carthage](#carthage)
16+
- [CocoaPods](#cocoapods)
17+
- [Carthage](#carthage)
1718
- [Usage](#usage)
1819
- [License](#license)
1920

@@ -27,9 +28,9 @@
2728

2829
## Requirements
2930

30-
- iOS 8.0+
31-
- Xcode 9.0+
32-
- RxSwift 4.0 & Texture 2.5
31+
- iOS 9.0+
32+
- Xcode 10.1+
33+
- RxSwift 5.0 & Texture 2.8
3334

3435
## Installation
3536

RxASDataSources.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxASDataSources'
3-
s.version = '0.3.4'
3+
s.version = '0.4.1'
44
s.license = { :type => "MIT", :file => "LICENSE" }
55
s.summary = 'RxDataSources for AsyncDisplayKit/Texture supports ASTableNode/ASCollectionNode'
66
s.homepage = 'https://github.com/RxSwiftCommunity/RxASDataSources'
77
s.social_media_url = 'https://twitter.com/dangthaison91'
88
s.authors = { "Dang Thai Son" => "[email protected]" }
99
s.source = { :git => "https://github.com/RxSwiftCommunity/RxASDataSources.git", :tag => s.version.to_s }
1010

11-
s.ios.deployment_target = '8.0'
11+
s.ios.deployment_target = '9.0'
1212
s.requires_arc = true
13-
s.swift_version = '5.0'
13+
s.swift_versions = '5.0'
1414

1515
s.source_files = "Sources/**/*.swift"
1616
s.framework = "Foundation"

Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ open class ASCollectionSectionedDataSource<S: SectionModelType>: NSObject, ASCol
3636

3737
fileprivate static func configureSupplementaryViewBlockNotSet(dataSource: ASCollectionSectionedDataSource<S>, node: ASCollectionNode, nodeForSupplementaryElementOfKind kind: String, indexPath: IndexPath) -> ASCellNodeBlock {
3838
// Users expect collectionNode(_nodeForSupplementaryElementOfKind:at:) will be executed in main thread according to api doc.
39-
return { DispatchQueue.main.sync(execute: { dataSource.collectionNode(node, nodeForSupplementaryElementOfKind: kind, at: indexPath) }) }
39+
let cellNode = dataSource.collectionNode(node, nodeForSupplementaryElementOfKind: kind, at: indexPath)
40+
return { cellNode }
4041
}
4142

4243
public init(

0 commit comments

Comments
 (0)