Skip to content

Commit abfcb32

Browse files
authored
Merge pull request #366 from mashe/feature/Support_of_mutable_cellViewModel
Adding support of mutable CellViewModels
2 parents 4ecd106 + b736608 commit abfcb32

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: objective-c
22

3-
osx_image: xcode10.2
3+
osx_image: xcode11.5
44

55
notifications:
66
slack: rxswift:3ykt2Z61f8GkdvhCZTYPduOL
@@ -10,9 +10,9 @@ install: true
1010

1111
env:
1212
- BUILD="brew install swiftlint"
13-
- BUILD="carthage update --platform iOS && pushd Examples && set -o pipefail && (xcodebuild -project Example.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project Example.xcodeproj -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
14-
- BUILD="carthage update --platform ios && set -o pipefail && (xcodebuild -project RxDataSources.xcodeproj -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test) | xcpretty"
15-
- BUILD="gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet; pod repo update && pod lib lint RxDataSources.podspec --verbose && pod lib lint Differentiator.podspec --verbose "
13+
- BUILD="carthage update --platform iOS && pushd Examples && set -o pipefail && (xcodebuild -project Example.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 8' test && xcodebuild -project Example.xcodeproj -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 8' build) | xcpretty"
14+
- BUILD="carthage update --platform iOS && set -o pipefail && (xcodebuild -project RxDataSources.xcodeproj -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 8' test) | xcpretty"
15+
- BUILD="gem install cocoapods --pre --no-document --quiet; pod repo update && pod lib lint RxDataSources.podspec --verbose && pod lib lint Differentiator.podspec --verbose "
1616
- BUILD="carthage update --platform iOS && carthage build --no-skip-current --platform iOS"
1717
- BUILD="carthage update --platform tvOS && carthage build --no-skip-current --platform tvOS"
1818
- BUILD="swift test"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
55

66
#### Master
77

8+
* Added support of mutable CellViewModels.
9+
810
## [4.0.1](https://github.com/RxSwiftCommunity/RxDataSources/releases/tag/4.0.1)
911

1012
* Fixes Carthage integration and reverts static frameworks to dynamic frameworks.

Sources/Differentiator/Diff.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,8 +623,10 @@ public enum Diff {
623623
let finalItem = finalItemCache[finalItemIndex.sectionIndex][finalItemIndex.itemIndex]
624624
if finalItem != initialSections[i].items[j] {
625625
updatedItems.append(ItemPath(sectionIndex: i, itemIndex: j))
626+
afterDeleteItems.append(finalItem)
627+
} else {
628+
afterDeleteItems.append(initialSections[i].items[j])
626629
}
627-
afterDeleteItems.append(finalItem)
628630
default:
629631
try precondition(false, "Unhandled case")
630632
}

0 commit comments

Comments
 (0)