Skip to content

Commit 128f9e4

Browse files
Merge pull request #3 from Omega-R/develop
Develop
2 parents 6d58a63 + ce0b0b2 commit 128f9e4

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.4.21"
3+
ext.kotlin_version = "1.4.32"
44
repositories {
55
google()
66
jcenter()
77
}
88
dependencies {
9-
classpath "com.android.tools.build:gradle:4.1.1"
9+
classpath "com.android.tools.build:gradle:4.1.3"
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong

library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ dependencies {
4242

4343
implementation 'androidx.core:core-ktx:1.3.2'
4444
implementation 'androidx.appcompat:appcompat:1.2.0'
45-
implementation 'androidx.recyclerview:recyclerview:1.1.0'
45+
implementation 'androidx.recyclerview:recyclerview:1.2.0'
4646

47-
implementation 'com.github.Omega-R.OmegaTypes:omegatypes:2.0.2'
47+
implementation 'com.github.Omega-R.OmegaTypes:omegatypes:2.0.3'
4848
implementation "com.github.Omega-R:OmegaRecyclerView:1.9.8@aar"
4949
implementation 'com.github.Omega-R:OmegaClicks:1.0.0'
50-
implementation 'com.github.Omega-R:OmegaAdapters:1.0.0'
50+
implementation 'com.github.Omega-R:OmegaAdapters:1.0.1'
5151

5252

53-
testImplementation 'junit:junit:4.13.1'
53+
testImplementation 'junit:junit:4.13.2'
5454
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
5555
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
5656
}

library/src/main/java/com/omega_r/bind/model/binders/Binder.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,16 @@ abstract class Binder<V : View, M> {
4141
@Suppress("UNCHECKED_CAST")
4242
protected fun <T> Any?.findValue(item: Any?, properties: Array<out KProperty<*>>): T? {
4343
var obj: Any? = item
44+
if (obj == null || obj::class.java === Any::class.java) {
45+
return null
46+
}
4447
for (property in properties) {
4548
obj = property.call(obj)
4649
if (obj == null) {
4750
break
51+
} else if (obj::class.java === Any::class.java) {
52+
obj = null
53+
break
4854
}
4955
}
5056
return obj?.let { it as T }

0 commit comments

Comments
 (0)