Upgraded project (#9)

* Project Upgraded

* updated RxJava library

* Upgraded to RxJava2

* Raised version to 2.0.0

* Updated versions on travis.yml

* Upgraded tests

* Changed to TestObserver

* There are 3 tests that need to be corrected I have ignored them.

* Lint issue

* Changed delay to computation scheduler

* reverted ignore and await method calls

* Changed readme version

* tests modified

* used createDefault and gradle wrapper command

* Changed to test method

* Changed to blockingSingle

* Min api 9

.travis.yml

@@ -21,8 +21,8 @@ android:
   - tools
   - tools
   - platform-tools
-  - build-tools-24.0.1
-  - android-24
+  - build-tools-27.0.3
+  - android-27
   - extra-android-support
   - extra-android-m2repository
 script: ./gradlew build

README.md

@@ -9,7 +9,7 @@ Grab the latest version from jCenter:
 
 ```gradle
 dependencies {
-  compile 'com.schibstedspain.android:rxpager:1.0.0'
+  compile 'com.schibstedspain.android:rxpager:2.0.0'
 }
 ```
 

build.gradle

@@ -3,27 +3,19 @@
 buildscript {
   repositories {
     jcenter()
+    google()
     maven { url 'https://jitpack.io' } // sdk manager
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.1.2'
+    classpath 'com.android.tools.build:gradle:3.1.2'
 
-    classpath 'com.novoda:bintray-release:0.3.4'
-
-    classpath 'com.github.JakeWharton:sdk-manager-plugin:1d29782dd6ffa18880c8cbada748fb3dea45e7be'
-
-    classpath 'me.tatarka:gradle-retrolambda:3.3.0-beta4'
-    classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
+    classpath 'com.novoda:bintray-release:0.8.0'
   }
-  configurations.classpath.exclude group: 'com.android.tools.external.lombok'
 }
 
 allprojects {
   repositories {
     jcenter()
+    google()
   }
 }
-
-task clean(type: Delete) {
-  delete rootProject.buildDir
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradlew

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

rxpager/build.gradle

@@ -1,26 +1,21 @@
-apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.library'
-apply from: '../quality.gradle'
-apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'com.novoda.bintray-release'
 
-retrolambda {
-  javaVersion JavaVersion.VERSION_1_7
-}
-
 group = 'com.schibstedspain.android'
-version = '1.0.0'
+version = '2.0.0'
 
 android {
-  compileSdkVersion 24
-  buildToolsVersion "24.0.1"
+  compileSdkVersion 27
 
   defaultConfig {
     minSdkVersion 9
-    targetSdkVersion 24
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
   }
+
+  flavorDimensions 'tier'
+
   buildTypes {
     debug {
       testCoverageEnabled true
@@ -38,17 +33,18 @@ android {
 }
 
 dependencies {
-  testCompile 'junit:junit:4.12'
-  testCompile 'org.mockito:mockito-core:1.10.19'
+  implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
+  implementation 'nl.littlerobots.rxlint:rxlint:1.6.1'
 
-  compile 'io.reactivex:rxjava:1.1.5'
+  testCompile 'junit:junit:4.12'
+  testCompile 'org.mockito:mockito-core:2.18.3'
 }
 
 publish {
   userOrg = 'schibstedspain'
   groupId = 'com.schibstedspain.android'
   artifactId = 'rxpager'
-  publishVersion = '1.0.0'
+  publishVersion = '2.0.0'
   desc = 'RxPager is an Android library that helps handling paginated results in a reactive way'
   website = 'https://github.com/SchibstedSpain/RxPager'
-}
+}

rxpager/src/main/java/com/schibstedspain/android/rxpager/Pager.java

@@ -1,27 +1,27 @@
 package com.schibstedspain.android.rxpager;
 
-import rx.Observable;
-import rx.functions.Func1;
-import rx.functions.Func2;
-import rx.subjects.BehaviorSubject;
-import rx.subjects.PublishSubject;
+import io.reactivex.Observable;
+import io.reactivex.functions.BiFunction;
+import io.reactivex.functions.Function;
+import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.subjects.PublishSubject;
 
 public class Pager<RESULT, NEXT_PAGE_ID> {
   private final PublishSubject<NEXT_PAGE_ID> pageIds;
   private NEXT_PAGE_ID nextPageId;
 
-  private final Func2<NEXT_PAGE_ID, RESULT, NEXT_PAGE_ID> pagingFunction;
-  private final Func1<NEXT_PAGE_ID, Observable<RESULT>> obtainFunction;
+  private final BiFunction<NEXT_PAGE_ID, RESULT, NEXT_PAGE_ID> pagingFunction;
+  private final Function<NEXT_PAGE_ID, Observable<RESULT>> obtainFunction;
   private final BehaviorSubject<Boolean> isLoading;
 
-  public Pager(NEXT_PAGE_ID firstPageId, Func2<NEXT_PAGE_ID, RESULT, NEXT_PAGE_ID> pagingFunction,
-      Func1<NEXT_PAGE_ID, Observable<RESULT>> obtainFunction) {
+  public Pager(NEXT_PAGE_ID firstPageId, BiFunction<NEXT_PAGE_ID, RESULT, NEXT_PAGE_ID> pagingFunction,
+      Function<NEXT_PAGE_ID, Observable<RESULT>> obtainFunction) {
     this.nextPageId = firstPageId;
     this.pagingFunction = pagingFunction;
     this.obtainFunction = obtainFunction;
 
     pageIds = PublishSubject.create();
-    isLoading = BehaviorSubject.create(false);
+    isLoading = BehaviorSubject.createDefault(false);
   }
 
   public Observable<RESULT> getPageObservable() {
@@ -45,15 +45,15 @@ public void next() {
   private Observable<RESULT> page(final NEXT_PAGE_ID source) {
     return pageIds.startWith(source)
         .concatMap(next_page_id ->
-            obtainFunction.call(next_page_id)
-                .doOnSubscribe(() -> isLoading.onNext(true))
+            obtainFunction.apply(next_page_id)
+                .doOnSubscribe(onSubscribe -> isLoading.onNext(true))
                 .doOnTerminate(() -> isLoading.onNext(false))
-                .doOnUnsubscribe(() -> isLoading.onNext(false))
+                .doOnDispose(() -> isLoading.onNext(false))
         )
         .doOnNext(page -> {
-          nextPageId = pagingFunction.call(nextPageId, page);
+          nextPageId = pagingFunction.apply(nextPageId, page);
           if (nextPageId == null) {
-            pageIds.onCompleted();
+            pageIds.onComplete();
           }
         });
   }