Skip to content

Commit d9fd2ce

Browse files
committed
Merge branch 'release/2.1.1'
2 parents e6005bf + 116a8c8 commit d9fd2ce

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

app/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@ android {
3636
}
3737

3838
dependencies {
39-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
40-
4139
implementation 'androidx.appcompat:appcompat:1.3.0'
42-
implementation 'androidx.recyclerview:recyclerview:1.2.0'
40+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
4341
implementation project(":properbaseadapter")
4442

45-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
43+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
4644

4745
testImplementation 'junit:junit:4.13.2'
48-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
49-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
46+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
47+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
5048
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.5.20'
2+
ext.kotlin_version = '1.5.21'
33
repositories {
44
google()
55
mavenCentral()

properbaseadapter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020
defaultConfig {
2121
minSdkVersion 16
2222
targetSdkVersion 30
23-
versionName "2.1.0"
23+
versionName "2.1.1"
2424

2525
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2626
}

properbaseadapter/src/main/kotlin/com/vojtkovszky/properbaseadapter/ProperBaseAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class ProperBaseAdapter constructor(data: MutableList<AdapterItem<*>> = mutableL
148148
* changed (Based on evaluation from [BaseDiffUtilCallBack])
149149
*/
150150
fun updateItems(data: List<AdapterItem<*>>) {
151-
val diffResult = DiffUtil.calculateDiff(BaseDiffUtilCallBack(data, data), false)
151+
val diffResult = DiffUtil.calculateDiff(BaseDiffUtilCallBack(this.data, data), false)
152152

153153
resetData(data)
154154
resetLastAnimationPosition()

0 commit comments

Comments
 (0)