Skip to content

Swift 5 Support #33

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
Jun 13, 2019
Merged

Swift 5 Support #33

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
a478646
Update to support Swift 5
foxware00 Jun 12, 2019
22037b8
Update to support Swift 5
foxware00 Jun 12, 2019
0345742
Update to support Swift 5
foxware00 Jun 12, 2019
a208157
Update to support Swift 5
foxware00 Jun 12, 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
3 changes: 2 additions & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github "RxSwiftCommunity/RxDataSources"
github "texturegroup/texture"
github "pinterest/PINCache" ~> 3.0.1
github "pinterest/PINCache" ~> 3.0.1-beta.7
github "ReactiveX/RxSwift" ~> 5.0.0
15 changes: 7 additions & 8 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
git "https://chromium.googlesource.com/webm/libwebp" "v0.5.1"
github "ReactiveX/RxSwift" "4.1.1"
github "RxSwiftCommunity/RxDataSources" "3.0.2"
github "pinterest/PINCache" "3.0.1-beta.5"
github "pinterest/PINOperation" "1.0.3"
github "pinterest/PINRemoteImage" "3.0.0-beta.12"
github "texturegroup/texture" "2.5.1"
github "pinterest/PINCache" "3.0.1-beta.6"
git "https://chromium.googlesource.com/webm/libwebp" "v0.6.0"
github "ReactiveX/RxSwift" "5.0.1"
github "RxSwiftCommunity/RxDataSources" "4.0.1"
github "pinterest/PINCache" "3.0.1-beta.8"
github "pinterest/PINOperation" "1.1.2"
github "pinterest/PINRemoteImage" "3.0.0-beta.13"
github "texturegroup/texture" "2.8.1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/PINCache
Open in desktop
Submodule PINCache updated 20 files
+12 −0 CHANGELOG.md
+4 −4 PINCache.podspec
+26 −2 PINCache.xcodeproj/project.pbxproj
+8 −0 PINCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+1 −3 PINCache.xcodeproj/xcshareddata/xcschemes/PINCache-macOS.xcscheme
+1 −3 PINCache.xcodeproj/xcshareddata/xcschemes/PINCache-tvOS.xcscheme
+1 −3 PINCache.xcodeproj/xcshareddata/xcschemes/PINCache.xcscheme
+1 −1 README.md
+24 −1 Source/PINCache.h
+72 −14 Source/PINCache.m
+69 −0 Source/PINCaching.h
+86 −9 Source/PINDiskCache.h
+353 −109 Source/PINDiskCache.m
+8 −2 Source/PINMemoryCache.h
+136 −39 Source/PINMemoryCache.m
+15 −0 Tests/NSDate+PINCacheTests.h
+50 −0 Tests/NSDate+PINCacheTests.m
+319 −25 Tests/PINCacheTests.m
+16 −0 Tests/PINDiskCache+PINCacheTests.h
+28 −0 Tests/PINDiskCache+PINCacheTests.m
2 changes: 1 addition & 1 deletion Carthage/Checkouts/PINOperation
Open in desktop
Submodule PINOperation updated 22 files
+3 −2 BUCK
+10 −1 CHANGELOG.md
+4 −0 CI/build.sh
+7 −0 CI/exclude-from-build.json
+23 −0 Dangerfile
+4 −0 Gemfile
+176 −201 LICENSE.txt
+27 −0 Makefile
+3 −3 PINOperation.podspec
+32 −4 PINOperation.xcodeproj/project.pbxproj
+8 −0 PINOperation.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+1 −1 PINOperation.xcodeproj/xcshareddata/xcschemes/PINOperation-macOS.xcscheme
+1 −1 PINOperation.xcodeproj/xcshareddata/xcschemes/PINOperation-tvOS.xcscheme
+1 −1 PINOperation.xcodeproj/xcshareddata/xcschemes/PINOperation.xcscheme
+2 −2 README.md
+19 −14 Source/PINOperationGroup.m
+81 −9 Source/PINOperationQueue.h
+62 −25 Source/PINOperationQueue.m
+6 −1 Tests/PINOperationGroupTests.m
+33 −25 Tests/PINOperationQueueTests.m
+0 −16 makefile
+0 −38 run_tests_update_status.sh
2 changes: 1 addition & 1 deletion Carthage/Checkouts/PINRemoteImage
Open in desktop
Submodule PINRemoteImage updated 318 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxDataSources
Open in desktop
Submodule RxDataSources updated 67 files
+0 −3 .gitmodules
+0 −1 .swift-version
+4 −5 .travis.yml
+17 −0 CHANGELOG.md
+1 −1 Cartfile
+1 −1 Cartfile.resolved
+2 −1 Differentiator.podspec
+1,276 −0 Examples/Example.xcodeproj/project.pbxproj
+7 −0 Examples/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+8 −0 Examples/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+30 −0 Examples/Example.xcodeproj/project.xcworkspace/xcshareddata/RxDataSources.xcscmblueprint
+5 −27 Examples/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
+2 −4 Examples/Example.xcodeproj/xcshareddata/xcschemes/ExampleUITests.xcscheme
+0 −0 Examples/Example/Assets.xcassets/AppIcon.appiconset/Contents.json
+0 −0 Examples/Example/Assets.xcassets/Contents.json
+0 −0 Examples/Example/Assets.xcassets/settings.imageset/Contents.json
+ − Examples/Example/Assets.xcassets/settings.imageset/settings@2x.png
+0 −0 Examples/Example/Base.lproj/LaunchScreen.storyboard
+0 −0 Examples/Example/Base.lproj/Main.storyboard
+0 −0 Examples/Example/Example1_CustomizationUsingTableViewDelegate.swift
+0 −0 Examples/Example/Example2_RandomizedSectionsAnimation.swift
+0 −0 Examples/Example/Example3_TableViewEditing.swift
+0 −0 Examples/Example/Example4_DifferentSectionAndItemTypes.swift
+0 −0 Examples/Example/Example5_UIPickerView.swift
+0 −0 Examples/Example/Info.plist
+0 −0 Examples/Example/Support/AppDelegate.swift
+1 −0 Examples/Example/Support/NumberSection.swift
+1 −0 Examples/Example/Support/Randomizer.swift
+0 −0 Examples/Example/Views/ImageTitleTableViewCell.swift
+0 −0 Examples/Example/Views/TitleSteperTableViewCell.swift
+0 −0 Examples/Example/Views/TitleSwitchTableViewCell.swift
+0 −0 Examples/Example/Views/UIKitExtensions.swift
+0 −0 Examples/ExampleUITests/ExampleUITests.swift
+0 −0 Examples/ExampleUITests/Info.plist
+1 −0 Examples/RxSwift
+1 −0 Examples/Sources
+0 −16 Package.resolved
+7 −3 Package.swift
+0 −19 Podfile
+36 −20 README.md
+6 −5 RxDataSources.podspec
+60 −928 RxDataSources.xcodeproj/project.pbxproj
+8 −0 RxDataSources.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+1 −3 RxDataSources.xcodeproj/xcshareddata/xcschemes/Differentiator.xcscheme
+1 −3 RxDataSources.xcodeproj/xcshareddata/xcschemes/RxDataSources.xcscheme
+1 −3 RxDataSources.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
+0 −1 RxSwift
+9 −0 Sources/Differentiator/AnimatableSectionModel.swift
+18 −18 Sources/Differentiator/Changeset.swift
+41 −46 Sources/Differentiator/Diff.swift
+1 −1 Sources/Differentiator/Info.plist
+3 −2 Sources/Differentiator/ItemPath.swift
+9 −0 Sources/Differentiator/SectionModel.swift
+6 −6 Sources/RxDataSources/AnimationConfiguration.swift
+14 −14 Sources/RxDataSources/CollectionViewSectionedDataSource.swift
+1 −1 Sources/RxDataSources/Info.plist
+43 −72 Sources/RxDataSources/RxCollectionViewSectionedAnimatedDataSource.swift
+4 −4 Sources/RxDataSources/RxCollectionViewSectionedReloadDataSource.swift
+18 −18 Sources/RxDataSources/RxPickerViewAdapter.swift
+41 −31 Sources/RxDataSources/RxTableViewSectionedAnimatedDataSource.swift
+4 −4 Sources/RxDataSources/RxTableViewSectionedReloadDataSource.swift
+15 −18 Sources/RxDataSources/TableViewSectionedDataSource.swift
+47 −62 Sources/RxDataSources/UI+SectionedViewType.swift
+10 −10 Tests/RxDataSourcesTests/ChangeSet+TestExtensions.swift
+8 −12 Tests/RxDataSourcesTests/Randomizer.swift
+5 −5 Tests/RxDataSourcesTests/RxCollectionViewSectionedDataSource+Test.swift
+0 −6 dependencies.sh
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Open in desktop
Submodule RxSwift updated 506 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/libwebp
Open in desktop
Submodule libwebp updated from 3d97bb to 50d1a8
2 changes: 1 addition & 1 deletion Carthage/Checkouts/texture
Open in desktop
Submodule texture updated 1164 files
12 changes: 6 additions & 6 deletions RxASDataSources.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxASDataSources'
s.version = '0.3.3'
s.version = '0.3.4'
s.license = { :type => "MIT", :file => "LICENSE" }
s.summary = 'RxDataSources for AsyncDisplayKit/Texture supports ASTableNode/ASCollectionNode'
s.homepage = 'https://github.com/RxSwiftCommunity/RxASDataSources'
Expand All @@ -10,13 +10,13 @@ Pod::Spec.new do |s|

s.ios.deployment_target = '8.0'
s.requires_arc = true
s.swift_version = '4.2'
s.swift_version = '5.0'

s.source_files = "Sources/**/*.swift"
s.framework = "Foundation"
s.dependency 'RxSwift', '~> 4.0'
s.dependency 'RxCocoa', '~> 4.0'
s.dependency 'Differentiator', '~> 3.0'
s.dependency 'Texture', '~> 2.5'
s.dependency 'RxSwift', '~> 5.0.0'
s.dependency 'RxCocoa', '~> 5.0.0'
s.dependency 'Differentiator', '~> 4.0'
s.dependency 'Texture', '~> 2.8.1'

end
127 changes: 0 additions & 127 deletions RxASDataSources.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,31 +68,6 @@
3549BB211DA389CD00C63030 /* RxASDataSources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxASDataSources.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3549BB581DA38A8800C63030 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3549BB8A1DA38C0A00C63030 /* RxTextureDataSourcesSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTextureDataSourcesSpec.swift; sourceTree = "<group>"; };
35CD64E81E60192300AF060B /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
35CD64EA1E60192300AF060B /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
35CD64EB1E60192300AF060B /* Profile.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Profile.xcconfig; sourceTree = "<group>"; };
35CD64EC1E60192300AF060B /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
35CD64ED1E60192300AF060B /* Test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Test.xcconfig; sourceTree = "<group>"; };
35CD64EF1E60192300AF060B /* Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Application.xcconfig; sourceTree = "<group>"; };
35CD64F01E60192300AF060B /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = "<group>"; };
35CD64F11E60192300AF060B /* StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticLibrary.xcconfig; sourceTree = "<group>"; };
35CD65041E60192300AF060B /* iOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Application.xcconfig"; sourceTree = "<group>"; };
35CD65051E60192300AF060B /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = "<group>"; };
35CD65061E60192300AF060B /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = "<group>"; };
35CD65071E60192300AF060B /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
35CD65091E60192300AF060B /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
35CD650A1E60192300AF060B /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
35CD650B1E60192300AF060B /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
35CD650C1E60192300AF060B /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
35CD650D1E60192300AF060B /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
35CD65101E60192300AF060B /* tvOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Application.xcconfig"; sourceTree = "<group>"; };
35CD65111E60192300AF060B /* tvOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Base.xcconfig"; sourceTree = "<group>"; };
35CD65121E60192300AF060B /* tvOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Framework.xcconfig"; sourceTree = "<group>"; };
35CD65131E60192300AF060B /* tvOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
35CD65151E60192300AF060B /* watchOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-Application.xcconfig"; sourceTree = "<group>"; };
35CD65161E60192300AF060B /* watchOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-Base.xcconfig"; sourceTree = "<group>"; };
35CD65171E60192300AF060B /* watchOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-Framework.xcconfig"; sourceTree = "<group>"; };
35CD65181E60192300AF060B /* watchOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "watchOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
497271B10CB7AAE70BBDEAF0 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
574265681F6424BE0059BD8F /* Differentiator.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Differentiator.framework; path = "../../../../Users/sondt/Library/Developer/Xcode/DerivedData/RxTextureDataSources-hjacuybyhkyzareukzfcxgvmvvmv/Build/Products/Debug-iphonesimulator/Differentiator.framework"; sourceTree = "<group>"; };
57826B9F1F29477000FB0414 /* RxASCollectionReloadDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxASCollectionReloadDataSource.swift; sourceTree = "<group>"; };
Expand All @@ -105,10 +80,6 @@
57826BB31F29491800FB0414 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
57826BB51F29491800FB0414 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57826BB91F2949D900FB0414 /* ASTableNode+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ASTableNode+Rx.swift"; sourceTree = "<group>"; };
57826BD41F29505000FB0414 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = "Carthage/Checkouts/RxSwift/build/Debug-iphoneos/RxCocoa.framework"; sourceTree = "<group>"; };
57826BD61F29505800FB0414 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = "Carthage/Checkouts/RxSwift/build/Debug-iphoneos/RxSwift.framework"; sourceTree = "<group>"; };
57826BD81F29506000FB0414 /* RxDataSources.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxDataSources.framework; path = "Carthage/Checkouts/RxDataSources/build/Debug-iphoneos/RxDataSources.framework"; sourceTree = "<group>"; };
57826BDC1F29509700FB0414 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = "Carthage/Checkouts/RxSwift/build/Debug-iphoneos/RxCocoa.framework"; sourceTree = "<group>"; };
57A64FFD1F1BF28D005C7A79 /* SectionedNodeType+BatchUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SectionedNodeType+BatchUpdate.swift"; sourceTree = "<group>"; };
57A650201F1BF309005C7A79 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57A650211F1BF309005C7A79 /* RxASDataSources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RxASDataSources.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -211,10 +182,6 @@
isa = PBXGroup;
children = (
574265681F6424BE0059BD8F /* Differentiator.framework */,
57826BDC1F29509700FB0414 /* RxCocoa.framework */,
57826BD81F29506000FB0414 /* RxDataSources.framework */,
57826BD61F29505800FB0414 /* RxSwift.framework */,
57826BD41F29505000FB0414 /* RxCocoa.framework */,
57E563091F28FECF002E825B /* RxDataSources.framework */,
57E563071F28FEC4002E825B /* RxCocoa.framework */,
57E563051F28FEBD002E825B /* RxSwift.framework */,
Expand All @@ -228,100 +195,10 @@
35CA2AD51E12933000147290 /* Configuration */ = {
isa = PBXGroup;
children = (
35CD64E51E60192300AF060B /* xcconfigs */,
);
path = Configuration;
sourceTree = "<group>";
};
35CD64E51E60192300AF060B /* xcconfigs */ = {
isa = PBXGroup;
children = (
35CD64E71E60192300AF060B /* Base */,
35CD65031E60192300AF060B /* iOS */,
35CD65081E60192300AF060B /* Mac OS X */,
35CD650F1E60192300AF060B /* tvOS */,
35CD65141E60192300AF060B /* watchOS */,
);
name = xcconfigs;
path = Carthage/Checkouts/xcconfigs;
sourceTree = SOURCE_ROOT;
};
35CD64E71E60192300AF060B /* Base */ = {
isa = PBXGroup;
children = (
35CD64E81E60192300AF060B /* Common.xcconfig */,
35CD64E91E60192300AF060B /* Configurations */,
35CD64EE1E60192300AF060B /* Targets */,
);
path = Base;
sourceTree = "<group>";
};
35CD64E91E60192300AF060B /* Configurations */ = {
isa = PBXGroup;
children = (
35CD64EA1E60192300AF060B /* Debug.xcconfig */,
35CD64EB1E60192300AF060B /* Profile.xcconfig */,
35CD64EC1E60192300AF060B /* Release.xcconfig */,
35CD64ED1E60192300AF060B /* Test.xcconfig */,
);
path = Configurations;
sourceTree = "<group>";
};
35CD64EE1E60192300AF060B /* Targets */ = {
isa = PBXGroup;
children = (
35CD64EF1E60192300AF060B /* Application.xcconfig */,
35CD64F01E60192300AF060B /* Framework.xcconfig */,
35CD64F11E60192300AF060B /* StaticLibrary.xcconfig */,
);
path = Targets;
sourceTree = "<group>";
};
35CD65031E60192300AF060B /* iOS */ = {
isa = PBXGroup;
children = (
35CD65041E60192300AF060B /* iOS-Application.xcconfig */,
35CD65051E60192300AF060B /* iOS-Base.xcconfig */,
35CD65061E60192300AF060B /* iOS-Framework.xcconfig */,
35CD65071E60192300AF060B /* iOS-StaticLibrary.xcconfig */,
);
path = iOS;
sourceTree = "<group>";
};
35CD65081E60192300AF060B /* Mac OS X */ = {
isa = PBXGroup;
children = (
35CD65091E60192300AF060B /* Mac-Application.xcconfig */,
35CD650A1E60192300AF060B /* Mac-Base.xcconfig */,
35CD650B1E60192300AF060B /* Mac-DynamicLibrary.xcconfig */,
35CD650C1E60192300AF060B /* Mac-Framework.xcconfig */,
35CD650D1E60192300AF060B /* Mac-StaticLibrary.xcconfig */,
);
path = "Mac OS X";
sourceTree = "<group>";
};
35CD650F1E60192300AF060B /* tvOS */ = {
isa = PBXGroup;
children = (
35CD65101E60192300AF060B /* tvOS-Application.xcconfig */,
35CD65111E60192300AF060B /* tvOS-Base.xcconfig */,
35CD65121E60192300AF060B /* tvOS-Framework.xcconfig */,
35CD65131E60192300AF060B /* tvOS-StaticLibrary.xcconfig */,
);
path = tvOS;
sourceTree = "<group>";
};
35CD65141E60192300AF060B /* watchOS */ = {
isa = PBXGroup;
children = (
35CD65151E60192300AF060B /* watchOS-Application.xcconfig */,
35CD65161E60192300AF060B /* watchOS-Base.xcconfig */,
35CD65171E60192300AF060B /* watchOS-Framework.xcconfig */,
35CD65181E60192300AF060B /* watchOS-StaticLibrary.xcconfig */,
);
path = watchOS;
sourceTree = "<group>";
};
57826BA81F29491800FB0414 /* Example */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -674,7 +551,6 @@
/* Begin XCBuildConfiguration section */
3549BB0B1DA387DB00C63030 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 35CD64EA1E60192300AF060B /* Debug.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -736,7 +612,6 @@
};
3549BB0C1DA387DB00C63030 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 35CD64EC1E60192300AF060B /* Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -791,7 +666,6 @@
};
3549BB271DA389CD00C63030 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 35CD65061E60192300AF060B /* iOS-Framework.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
Expand All @@ -811,7 +685,6 @@
};
3549BB281DA389CD00C63030 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 35CD65061E60192300AF060B /* iOS-Framework.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
Expand Down
4 changes: 2 additions & 2 deletions Sources/DataSources/RxProxies/RxASTableDelegateProxy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public extension Reactive where Base: ASTableNode {
var itemInserted: ControlEvent<IndexPath> {
let source = self.dataSource.methodInvoked(#selector(ASTableDataSource.tableView(_:commit:forRowAt:)))
.filter { a in
return UITableViewCellEditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .insert
return UITableViewCell.EditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .insert
}
.map { a in
return (try castOrThrow(IndexPath.self, a[2]))
Expand All @@ -84,7 +84,7 @@ public extension Reactive where Base: ASTableNode {
var itemDeleted: ControlEvent<IndexPath> {
let source = self.dataSource.methodInvoked(#selector(ASTableDataSource.tableView(_:commit:forRowAt:)))
.filter { a in
return UITableViewCellEditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .delete
return UITableViewCell.EditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .delete
}
.map { a in
return try castOrThrow(IndexPath.self, a[2])
Expand Down