Add rxjava2 support, change artifact id

Author: davidbilik

app/src/main/java/com/ackee/versionupdatehandler/setup/MainActivity.kt

@@ -1,16 +1,14 @@
 package com.ackee.versionupdatehandler.setup
 
-import android.app.Activity
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
-import android.widget.Toast
 import com.ackee.versionupdatehandler.R
 import com.ackee.versioupdatehandler.VersionStatusResolver
 import com.ackee.versioupdatehandler.model.BasicVersionsConfiguration
 import com.ackee.versioupdatehandler.model.DialogSettings
 import com.ackee.versioupdatehandler.model.VersionStatus
+import io.reactivex.Single
 import org.jetbrains.anko.*
-import rx.Single
 import java.util.*
 
 /**
@@ -71,12 +69,12 @@ class MainActivity : AppCompatActivity() {
                         VersionStatusResolver({
                             Single.just(BasicVersionsConfiguration(10, 15))
                         }).checkVersionStatus(if (Random().nextInt() % 2 == 0) 8 else 12)
-                                .subscribe {
+                                .subscribe({
                                     when (it) {
                                         VersionStatus.UPDATE_AVAILABLE -> toast("Update is available")
                                         VersionStatus.UPDATE_REQUIRED -> toast("Mandatory update is available")
                                     }
-                                }
+                                }, Throwable::printStackTrace)
                     }
                 }.lparams(width = matchParent) {
                     bottomMargin = dip(16)

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

firebase-fetcher/gradle.properties

@@ -1,4 +1,4 @@
 POM_NAME=FirebaseFetcher
-POM_ARTIFACT_ID=firebase-fetcher
+POM_ARTIFACT_ID=firebase-fetcher2
 POM_PACKAGING=aar
 POM_DESCRIPTION=Fetcher of app version from firebase remote config

firebase-fetcher/src/main/java/com/ackee/versionupdatehandler/FirebaseVersionFetcher.java

@@ -11,8 +11,10 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 
-import rx.Single;
-import rx.SingleSubscriber;
+import io.reactivex.Single;
+import io.reactivex.SingleEmitter;
+import io.reactivex.SingleOnSubscribe;
+
 
 /**
  * Class that fetches version configuration from Firebase Remote.
@@ -46,25 +48,24 @@ public FirebaseVersionFetcher(int cacheExpiration, String minimalAttributeName,
 
     @Override
     public Single<VersionsConfiguration> fetch() {
-        return Single.create(new Single.OnSubscribe<VersionsConfiguration>() {
+        return Single.create(new SingleOnSubscribe<VersionsConfiguration>() {
             @Override
-            public void call(final SingleSubscriber<? super VersionsConfiguration> singleSubscriber) {
+            public void subscribe(final SingleEmitter<VersionsConfiguration> emitter) throws Exception {
                 boolean isDevMode = FirebaseRemoteConfig.getInstance().getInfo().getConfigSettings().isDeveloperModeEnabled();
 
                 FirebaseRemoteConfig.getInstance().fetch(isDevMode ? 0 : cacheExpiration).addOnCompleteListener(new OnCompleteListener<Void>() {
                     @Override
                     public void onComplete(@NonNull Task<Void> task) {
                         if (task.isSuccessful()) {
-                            Log.d("FirebaseVersionFetcher", "onComplete: success");
                             FirebaseRemoteConfig.getInstance().activateFetched();
                         } else {
-                            Log.d("FirebaseVersionFetcher", "onComplete: failed");
-                            singleSubscriber.onError(new VersionFetchError());
+
+                            emitter.onError(new VersionFetchError());
                         }
                         long minimalVersion = FirebaseRemoteConfig.getInstance().getLong(minimalAttributeName);
                         long currentVersion = FirebaseRemoteConfig.getInstance().getLong(currentAttributeName);
 
-                        singleSubscriber.onSuccess(new BasicVersionsConfiguration(minimalVersion, currentVersion));
+                        emitter.onSuccess(new BasicVersionsConfiguration(minimalVersion, currentVersion));
                     }
                 });
             }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Apr 18 15:25:23 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

library/build.gradle

@@ -27,8 +27,8 @@ android {
 dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'io.reactivex:rxjava:1.2.5'
-    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'io.reactivex.rxjava2:rxjava:2.0.1'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
 
 }
 

library/gradle.properties

@@ -1,4 +1,4 @@
 POM_NAME=StatusResolver
-POM_ARTIFACT_ID=status-resolver
+POM_ARTIFACT_ID=status-resolver2
 POM_PACKAGING=aar
 POM_DESCRIPTION=Resolver of application update status

library/src/main/java/com/ackee/versioupdatehandler/VersionFetcher.java

@@ -2,7 +2,8 @@
 
 import com.ackee.versioupdatehandler.model.VersionsConfiguration;
 
-import rx.Single;
+import io.reactivex.Single;
+
 
 /**
  * Base interface for classes that will handle version fetching.

library/src/main/java/com/ackee/versioupdatehandler/VersionStatusResolver.java

@@ -7,11 +7,11 @@
 import com.ackee.versioupdatehandler.model.VersionStatus;
 import com.ackee.versioupdatehandler.model.VersionsConfiguration;
 
-import rx.Single;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.functions.Function;
+import io.reactivex.schedulers.Schedulers;
 
 
 /**
@@ -30,9 +30,9 @@ public VersionStatusResolver(VersionFetcher fetcher) {
 
     public Single<VersionStatus> checkVersionStatus(final int version) {
         return fetcher.fetch()
-                .map(new Func1<VersionsConfiguration, VersionStatus>() {
+                .map(new Function<VersionsConfiguration, VersionStatus>() {
                     @Override
-                    public VersionStatus call(VersionsConfiguration versionsConfiguration) {
+                    public VersionStatus apply(VersionsConfiguration versionsConfiguration) {
                         return resolveStatus(version, versionsConfiguration);
                     }
                 });
@@ -72,16 +72,16 @@ public void checkVersionStatusAndOpenDefault(final int version, final FragmentMa
         checkVersionStatus(version)
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<VersionStatus>() {
+                .subscribe(new Consumer<VersionStatus>() {
                     @Override
-                    public void call(VersionStatus versionStatus) {
+                    public void accept(VersionStatus versionStatus) {
                         if (versionStatus != VersionStatus.UP_TO_DATE) {
                             showDialog(versionStatus == VersionStatus.UPDATE_REQUIRED, fragmentManager, settings);
                         }
                     }
-                }, new Action1<Throwable>() {
+                }, new Consumer<Throwable>() {
                     @Override
-                    public void call(Throwable throwable) {
+                    public void accept(Throwable throwable) {
                         throwable.printStackTrace();
                     }
                 });

library/src/test/java/com/ackee/versioupdatehandler/VersionStatusResolverTest.java

@@ -8,9 +8,10 @@
 
 import org.junit.Test;
 
-import rx.Single;
-import rx.functions.Func1;
-import rx.observers.TestSubscriber;
+import io.reactivex.Single;
+import io.reactivex.functions.Function;
+import io.reactivex.observers.TestObserver;
+
 
 /**
  * Tests for {@link VersionStatusResolver}
@@ -31,12 +32,12 @@ public Single<VersionsConfiguration> fetch() {
                 return Single.error(new VersionFetchError());
             }
         });
-        TestSubscriber<VersionStatus> testSubscriber = TestSubscriber.create();
+        TestObserver<VersionStatus> testSubscriber = TestObserver.create();
         resolver.checkVersionStatus(0)
                 .subscribe(testSubscriber);
         testSubscriber.assertError(VersionFetchError.class);
         testSubscriber.assertNoValues();
-        testSubscriber.assertTerminalEvent();
+        testSubscriber.assertTerminated();
     }
 
     @Test
@@ -63,18 +64,18 @@ private void checkSuccess(int actualVersion, VersionStatus expectedResult) {
         VersionStatusResolver resolver = new VersionStatusResolver(new VersionFetcher() {
             @Override
             public Single<VersionsConfiguration> fetch() {
-                return Single.just(BASIC_VERSIONS_CONFIGURATION).map(new Func1<BasicVersionsConfiguration, VersionsConfiguration>() {
+                return Single.just(BASIC_VERSIONS_CONFIGURATION).map(new Function<BasicVersionsConfiguration, VersionsConfiguration>() {
                     @Override
-                    public VersionsConfiguration call(BasicVersionsConfiguration basicVersionsConfiguration) {
+                    public VersionsConfiguration apply(BasicVersionsConfiguration basicVersionsConfiguration) {
                         return basicVersionsConfiguration;
                     }
                 });
             }
         });
-        TestSubscriber<VersionStatus> testSubscriber = TestSubscriber.create();
+        TestObserver<VersionStatus> testObserver = TestObserver.create();
         resolver.checkVersionStatus(actualVersion)
-                .subscribe(testSubscriber);
-        testSubscriber.assertValue(expectedResult);
-        testSubscriber.assertNoErrors();
+                .subscribe(testObserver);
+        testObserver.assertValue(expectedResult);
+        testObserver.assertNoErrors();
     }
 }