Support Android JetPack

.travis.yml

@@ -15,8 +15,8 @@ before_install:
   - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
 
   - sdkmanager tools
-  - sdkmanager "system-images;android-18;default;armeabi-v7a"
-  - echo no | avdmanager create avd --force -n test -k "system-images;android-18;default;armeabi-v7a"
+  - sdkmanager "system-images;android-22;default;armeabi-v7a"
+  - echo no | avdmanager create avd --force -n test -k "system-images;android-22;default;armeabi-v7a"
   - $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window &
 
 before_script:

build.gradle

@@ -1,23 +1,22 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.2.71'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.novoda:bintray-release:0.7.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.novoda:bintray-release:0.8.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     ext {
-        compileSdkVersion = 26
-        buildToolVersion = '26.0.2'
+        compileSdkVersion = 28
+        buildToolVersion = '28.0.3'
         minSdkVersion = 14
 
         //publish
@@ -28,6 +27,7 @@ allprojects {
         reactiveAndroidSupportV4 = 'reactiveandroid-support-v4'
         reactiveAndroidUI = 'reactiveandroid-ui'
         reactiveAndroidDesign = 'reactiveandroid-design'
+        reactiveAndroidXAppcompat = 'reactiveandroidx-appcompat'
 
         autoPublish = true
         desc = 'Reactive events and properties with RxJava for Android'
@@ -37,7 +37,7 @@ allprojects {
         website = 'https://github.com/kittinunf/ReactiveAndroid'
 
         //kotlin
-        kotlinVersion = '1.1.60'
+        kotlinVersion = '1.2.71'
         kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
         kotlinAndroidExtensions = "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
@@ -52,9 +52,15 @@ allprojects {
         androidSupportGridLayout = "com.android.support:gridlayout-v7:$supportVersion"
         androidSupportDesign = "com.android.support:design:$supportVersion"
 
+        //androidx
+        androidxVersion = '1.0.0'
+        androidxAppCompat = "androidx.appcompat:appcompat:$androidxVersion"
+        androidxRecyclerView = "androidx.recyclerview:recyclerview:$androidxVersion"
+        androidxCardView = "androidx.cardview:cardview:$androidxVersion"
+
         //rxjava2
-        reactivexRxJava2 = 'io.reactivex.rxjava2:rxjava:2.1.0'
-        reactivexRxAndroid2 = 'io.reactivex.rxjava2:rxandroid:2.0.1'
+        reactivexRxJava2 = 'io.reactivex.rxjava2:rxjava:2.2.2'
+        reactivexRxAndroid2 = 'io.reactivex.rxjava2:rxandroid:2.1.0'
 
         //test
         junit = 'junit:junit:4.12'

deploy_bintray.sh

@@ -4,7 +4,7 @@ if [[ "$TRAVIS_BRANCH" == */release-v* ]]; then
 
   echo "We're on release branch, deploying at $TRAVIS_BRANCH"
 
-  modules=("reactiveandroid" "reactiveandroid-design" "reactiveandroid-ui" "reactiveandroid-support-v4" "reactiveandroid-appcompat-v7")
+  modules=("reactiveandroid" "reactiveandroid-design" "reactiveandroid-ui" "reactiveandroid-support-v4" "reactiveandroid-appcompat-v7" "reactiveandroidx-appcompat")
   for i in "${modules[@]}"
   do
     echo ">> Deploying $i ..."

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

reactiveandroid-appcompat-v7/build.gradle

@@ -43,20 +43,20 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':reactiveandroid-ui')
+    api project(':reactiveandroid-ui')
 
-    compile parent.ext.androidAppCompatV7
-    compile parent.ext.androidSupportGridLayout
-    compile parent.ext.androidSupportRecyclerView
-    compile parent.ext.androidSupportCardView
+    api parent.ext.androidAppCompatV7
+    api parent.ext.androidSupportGridLayout
+    api parent.ext.androidSupportRecyclerView
+    api parent.ext.androidSupportCardView
 
-    androidTestCompile parent.ext.supportTestEspressoCore
-    androidTestCompile parent.ext.supportTestEspressoContrib
-    androidTestCompile parent.ext.supportTestRunner
-    androidTestCompile parent.ext.supportTestRules
-    androidTestCompile parent.ext.awaitility
+    androidTestImplementation parent.ext.supportTestEspressoCore
+    androidTestImplementation parent.ext.supportTestEspressoContrib
+    androidTestImplementation parent.ext.supportTestRunner
+    androidTestImplementation parent.ext.supportTestRules
+    androidTestImplementation parent.ext.awaitility
 }
 
 buildscript {
@@ -82,4 +82,7 @@ publish {
 
 tasks.withType(Javadoc) {
     enabled = false
+}
+repositories {
+    mavenCentral()
 }

reactiveandroid-design/build.gradle

@@ -41,14 +41,14 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':reactiveandroid-ui')
+    api project(':reactiveandroid-ui')
 
-    compile parent.ext.androidSupportDesign
+    api parent.ext.androidSupportDesign
 
-    testCompile parent.ext.junit
-    testCompile parent.ext.robolectric
+    testImplementation parent.ext.junit
+    testImplementation parent.ext.robolectric\
 }
 
 buildscript {
@@ -74,4 +74,7 @@ publish {
 
 tasks.withType(Javadoc) {
     enabled = false
+}
+repositories {
+    mavenCentral()
 }

reactiveandroid-support-v4/build.gradle

@@ -41,14 +41,14 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':reactiveandroid-ui')
+    api project(':reactiveandroid-ui')
 
-    compile parent.ext.androidSupportV4
+    api parent.ext.androidSupportV4
 
-    testCompile parent.ext.junit
-    testCompile parent.ext.robolectric
+    testImplementation parent.ext.junit
+    testImplementation parent.ext.robolectric
 }
 
 buildscript {
@@ -74,4 +74,7 @@ publish {
 
 tasks.withType(Javadoc) {
     enabled = false
+}
+repositories {
+    mavenCentral()
 }

reactiveandroid-ui/build.gradle

@@ -43,18 +43,19 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':reactiveandroid')
+    api project(':reactiveandroid')
 
-    compile parent.ext.reactivexRxAndroid2
-    compile parent.ext.androidSupportAnnotation
+    api parent.ext.kotlinStdLib
+    api parent.ext.reactivexRxAndroid2
+    api parent.ext.androidSupportAnnotation
 
-    androidTestCompile parent.ext.supportTestEspressoCore
-    androidTestCompile parent.ext.supportTestEspressoContrib
-    androidTestCompile parent.ext.supportTestRunner
-    androidTestCompile parent.ext.supportTestRules
-    androidTestCompile parent.ext.awaitility
+    androidTestImplementation parent.ext.supportTestEspressoCore
+    androidTestImplementation parent.ext.supportTestEspressoContrib
+    androidTestImplementation parent.ext.supportTestRunner
+    androidTestImplementation parent.ext.supportTestRules
+    androidTestImplementation parent.ext.awaitility
 }
 
 buildscript {
@@ -80,4 +81,7 @@ publish {
 
 tasks.withType(Javadoc) {
     enabled = false
+}
+repositories {
+    mavenCentral()
 }

reactiveandroid-ui/src/main/kotlin/com/github/kittinunf/reactiveandroid/reactive/AndroidBindingConsumer.kt

@@ -16,5 +16,5 @@ class AndroidBindingConsumer<out E, T>(item: E,
 
 private object Threads {
     val mainThreadHandler = Handler(Looper.getMainLooper())
-    val mainThread = Looper.getMainLooper().thread
+    val mainThread: Thread = Looper.getMainLooper().thread
 }

reactiveandroid-ui/src/main/kotlin/com/github/kittinunf/reactiveandroid/scheduler/AndroidThreadScheduler.kt

@@ -17,15 +17,15 @@ private class ReadWriteLazyVal<T>(private val initializer: () -> T) : ReadWriteP
 
     private var value: Any? = null
 
-    operator override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+    override operator fun getValue(thisRef: Any?, property: KProperty<*>): T {
         if (value == null) {
             value = (initializer()) ?: throw IllegalStateException("Initializer block of property ${property.name} return null")
         }
         @Suppress("UNCHECKED_CAST")
         return value as T
     }
 
-    operator override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
+    override operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
         this.value = value
     }
 

reactiveandroid/build.gradle

@@ -12,13 +12,13 @@ repositories {
 }
 
 dependencies {
-    compile parent.ext.kotlinStdLib
-    compile parent.ext.reactivexRxJava2
+    api parent.ext.kotlinStdLib
+    api parent.ext.reactivexRxJava2
 
     sourceCompatibility = JavaVersion.VERSION_1_6
     targetCompatibility = JavaVersion.VERSION_1_6
 
-    testCompile parent.ext.junit
+    testImplementation parent.ext.junit
 }
 
 buildscript {

reactiveandroid/src/main/kotlin/com/github/kittinunf/reactiveandroid/ExtensionFieldDelegate.kt

@@ -9,7 +9,7 @@ class ExtensionFieldDelegate<in R, T : Any>(private val initializer: (R) -> T,
     private val map = WeakIdentityHashMap<R, T>()
 
     operator fun getValue(ref: R, property: KProperty<*>): T =
-            map.getOrPut(ref, { setValue(ref, property, initializer(ref)) })
+            map.getOrPut(ref) { setValue(ref, property, initializer(ref)) }
 
     operator fun setValue(ref: R, property: KProperty<*>, value: T): T {
         ref.builder(value)
@@ -25,7 +25,7 @@ class FieldDelegate<in T, U : Any>(private val initializer: (T) -> U,
     private val map = WeakIdentityHashMap<T, U>()
 
     operator fun getValue(ref: T, property: KProperty<*>): U =
-            map.getOrPut(ref, { setValue(ref, property, initializer(ref)) })
+            map.getOrPut(ref) { setValue(ref, property, initializer(ref)) }
 
     operator fun setValue(ref: T, property: KProperty<*>, value: U): U {
         ref.builder(value)

reactiveandroid/src/main/kotlin/com/github/kittinunf/reactiveandroid/Property.kt

@@ -12,13 +12,13 @@ interface PropertyType<T> {
 
     val observable: Observable<T>
 
-    fun subscribe(observer: Observer<T>) = observable.subscribeWith(observer)
+    fun subscribe(observer: Observer<T>): Observer<T> = observable.subscribeWith(observer)
 
-    fun subscribe(onNext: (T) -> Unit) = observable.subscribe(onNext)
+    fun subscribe(onNext: (T) -> Unit): Disposable = observable.subscribe(onNext)
 
-    fun subscribe(onNext: (T) -> Unit, onError: (Throwable) -> Unit) = observable.subscribe(onNext, onError)
+    fun subscribe(onNext: (T) -> Unit, onError: (Throwable) -> Unit): Disposable = observable.subscribe(onNext, onError)
 
-    fun subscribe(onNext: (T) -> Unit, onError: (Throwable) -> Unit, onComplete: () -> Unit) = observable.subscribe(onNext, onError, onComplete)
+    fun subscribe(onNext: (T) -> Unit, onError: (Throwable) -> Unit, onComplete: () -> Unit): Disposable = observable.subscribe(onNext, onError, onComplete)
 
 }
 

reactiveandroid/src/main/kotlin/com/github/kittinunf/reactiveandroid/helper/Observables.kt

@@ -6,9 +6,9 @@ import io.reactivex.functions.Function3
 
 object Observables {
 
-    inline fun <T1, T2, R> combineLatest(s1: Observable<T1>, s2: Observable<T2>, crossinline f: (T1, T2) -> R) =
+    inline fun <T1, T2, R> combineLatest(s1: Observable<T1>, s2: Observable<T2>, crossinline f: (T1, T2) -> R): Observable<R> =
             Observable.combineLatest<T1, T2, R>(s1, s2, BiFunction { t1, t2 -> f(t1, t2) })
 
-    inline fun <T1, T2, T3, R> combineLatest(s1: Observable<T1>, s2: Observable<T2>, s3: Observable<T3>, crossinline f: (T1, T2, T3) -> R) =
+    inline fun <T1, T2, T3, R> combineLatest(s1: Observable<T1>, s2: Observable<T2>, s3: Observable<T3>, crossinline f: (T1, T2, T3) -> R): Observable<R> =
             Observable.combineLatest<T1, T2, T3, R>(s1, s2, s3, Function3 { t1, t2, t3 -> f(t1, t2, t3) })
 }

reactiveandroid/src/main/kotlin/com/github/kittinunf/reactiveandroid/reactive/ObservableExtension.kt

@@ -15,4 +15,4 @@ fun <T> Observable<T>.cachedPrevious(): Observable<Pair<T?, T?>> {
             .skip(1)
 }
 
-inline fun <reified T> Observable<in T>.ofType() = ofType(T::class.java)
+inline fun <reified T> Observable<in T>.ofType(): Observable<T> = ofType(T::class.java)

reactiveandroidx-appcompat/.gitignore

@@ -0,0 +1 @@
+/build