Skip to content

Deadlock on supplementary nodes #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dangthaison91 merged 5 commits into from
Sep 2, 2019
+11 −10
Merged

Deadlock on supplementary nodes #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61e9344
Merge pull request #1 from RxSwiftCommunity/master
foxware00 Jun 7, 2019
bfbfcb5
Merge pull request #2 from RxSwiftCommunity/master
foxware00 Sep 2, 2019
8466e95
Fix for block on main thread when using supplementary nodes
foxware00 Sep 2, 2019
3a818f7
0.4.1
foxware00 Sep 2, 2019
5f77703
0.4.1
foxware00 Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .swift-version
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

## RxASDataSources

[![Platforms](https://img.shields.io/cocoapods/p/RxASDataSources.svg)](https://cocoapods.org/pods/RxASDataSources)
Expand All @@ -12,8 +13,8 @@
- [Features](#features)
- [Requirements](#requirements)
- [Installation](#installation)
- [CocoaPods](#cocoapods)
- [Carthage](#carthage)
- [CocoaPods](#cocoapods)
- [Carthage](#carthage)
- [Usage](#usage)
- [License](#license)

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions RxASDataSources.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Pod::Spec.new do |s|
s.name = 'RxASDataSources'
s.version = '0.3.4'
s.version = '0.4.1'
Copy link
Copy Markdown
Collaborator

@dangthaison91 dangthaison91 Sep 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please revert pod version or help to combine with PR #35 for version 0.4 that supports Swift 5?

Copy link
Copy Markdown
Contributor Author

@foxware00 foxware00 Sep 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dangthaison91 Done

s.license = { :type => "MIT", :file => "LICENSE" }
s.summary = 'RxDataSources for AsyncDisplayKit/Texture supports ASTableNode/ASCollectionNode'
s.homepage = 'https://github.com/RxSwiftCommunity/RxASDataSources'
s.social_media_url = 'https://twitter.com/dangthaison91'
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"
Expand Down
3 changes: 2 additions & 1 deletion Sources/DataSources/ASCollectionNode+Rx/ASCollectionSectionedDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ open class ASCollectionSectionedDataSource<S: SectionModelType>: NSObject, ASCol

fileprivate static func configureSupplementaryViewBlockNotSet(dataSource: ASCollectionSectionedDataSource<S>, 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(
Expand Down