Merge pull request #46 from wching/master

Migration to RxJava 2
trivago · Mar 22, 2019 · 8e37578 · 8e37578
2 parents fcccf44 + d8e2746
commit 8e37578
Show file tree

Hide file tree

Showing 34 changed files with 170 additions and 175 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,33 +1,40 @@
 language: android
-
+sudo: required
 jdk: oraclejdk8
 
 env:
   global:
-    - MALLOC_ARENA_MAX=2
-    - ADB_INSTALL_TIMEOUT=10
-  matrix:
-    - ANDROID_TARGET=android-22  ANDROID_ABI=armeabi-v7a
+    - ANDROID_API_LEVEL=28
+    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_ABI=armeabi-v7a
 
 android:
   components:
     - tools
-    - build-tools-25.0.3
-    - android-25
-    - android-24
-    - android-22
-    - android-23
-    - sys-img-armeabi-v7a-android-22
-    - extra-google-m2repository
+    - platform-tools
     - extra-android-m2repository
-    - extra-android-support
+  licenses:
+    - 'android-sdk-preview-license-52d11cd2'
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
 
-sudo: required
+before_install:
+  - touch $HOME/.android/repositories.cfg
+  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "build-tools;28.0.3"
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 
 before_script:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
+  - chmod +x gradlew
 
-script: ./gradlew library:test
+script:
+  - ./gradlew library:test
diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,12 +1,7 @@
 apply plugin: 'groovy'
 apply plugin: 'maven'
-apply plugin: 'me.tatarka.retrolambda'
 
 buildscript {
-    dependencies {
-        classpath 'me.tatarka:gradle-retrolambda:3.6.1'
-    }
-
     repositories {
         mavenCentral()
     }
@@ -24,15 +19,15 @@ repositories {
 dependencies {
 
     // Rx
-    compile 'io.reactivex:rxjava:1.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
 
     // GSON
-    compile 'com.google.code.gson:gson:2.8.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
 
     // Testing
-    testCompile "cglib:cglib:2.2"
-    testCompile 'junit:junit:4.12'
-    testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
+    testImplementation "cglib:cglib:2.2"
+    testImplementation 'junit:junit:4.12'
+    testImplementation('org.spockframework:spock-core:1.0-groovy-2.4') {
         exclude group: 'junit'
     }
-}
+}
diff --git a/...einfabrik/heimdall/OAuth2AccessToken.java → ...infabrik/heimdall2/OAuth2AccessToken.java b/...einfabrik/heimdall/OAuth2AccessToken.java → ...infabrik/heimdall2/OAuth2AccessToken.java
@@ -1,7 +1,6 @@
-package de.rheinfabrik.heimdall;
+package de.rheinfabrik.heimdall2;
 
 import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
 import java.util.Calendar;
 

diff --git a/...ik/heimdall/OAuth2AccessTokenManager.java → ...k/heimdall2/OAuth2AccessTokenManager.java b/...ik/heimdall/OAuth2AccessTokenManager.java → ...k/heimdall2/OAuth2AccessTokenManager.java
@@ -1,13 +1,10 @@
-package de.rheinfabrik.heimdall;
+package de.rheinfabrik.heimdall2;
 
+import de.rheinfabrik.heimdall2.grants.OAuth2Grant;
+import de.rheinfabrik.heimdall2.grants.OAuth2RefreshAccessTokenGrant;
+import io.reactivex.Single;
 import java.util.Calendar;
 
-import de.rheinfabrik.heimdall.grants.OAuth2Grant;
-import de.rheinfabrik.heimdall.grants.OAuth2RefreshAccessTokenGrant;
-import rx.Single;
-
-import static rx.Single.error;
-
 /**
  * The all-seeing and all-hearing guardian sentry of your application who
  * stands on the rainbow bridge to handle all your access tokens needs!
@@ -78,7 +75,7 @@ public Single<TAccessToken> grantNewAccessToken(OAuth2Grant<TAccessToken> grant,
                         accessToken.expirationDate = expirationDate;
                     }
                     mStorage.storeAccessToken(accessToken);
-                }).toObservable().cache().toSingle();
+                }).cache();
     }
 
     /**
@@ -97,7 +94,7 @@ public Single<TAccessToken> getValidAccessToken(final OAuth2RefreshAccessTokenGr
         return mStorage.getStoredAccessToken()
                 .flatMap(accessToken -> {
                     if (accessToken == null) {
-                        return error(new IllegalStateException("No access token found."));
+                        return Single.error(new IllegalStateException("No access token found."));
                     } else if (accessToken.isExpired()) {
                         refreshAccessTokenGrant.refreshToken = accessToken.refreshToken;
 

diff --git a/...ik/heimdall/OAuth2AccessTokenStorage.java → ...k/heimdall2/OAuth2AccessTokenStorage.java b/...ik/heimdall/OAuth2AccessTokenStorage.java → ...k/heimdall2/OAuth2AccessTokenStorage.java
@@ -1,6 +1,7 @@
-package de.rheinfabrik.heimdall;
+package de.rheinfabrik.heimdall2;
 
-import rx.Single;
+
+import io.reactivex.Single;
 
 /**
  * Interface used to define how to store and retrieve a stored access token.

diff --git a/.../grants/OAuth2AuthorizationCodeGrant.java → .../grants/OAuth2AuthorizationCodeGrant.java b/.../grants/OAuth2AuthorizationCodeGrant.java → .../grants/OAuth2AuthorizationCodeGrant.java
@@ -1,19 +1,17 @@
-package de.rheinfabrik.heimdall.grants;
+package de.rheinfabrik.heimdall2.grants;
 
-import java.io.UnsupportedEncodingException;
+import de.rheinfabrik.heimdall2.OAuth2AccessToken;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.subjects.PublishSubject;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import de.rheinfabrik.heimdall.OAuth2AccessToken;
-import rx.Observable;
-import rx.Single;
-import rx.subjects.BehaviorSubject;
-import rx.subjects.PublishSubject;
-
 /**
  * Class representing the Authorization Code Grant as described in https://tools.ietf.org/html/rfc6749#section-4.1.
  *
@@ -71,7 +69,7 @@ public abstract class OAuth2AuthorizationCodeGrant<TAccessToken extends OAuth2Ac
      * Observable emitting the authorization Uri.
      */
     public final Observable<URL> authorizationUri() {
-        return mAuthorizationUrlSubject.asObservable();
+        return mAuthorizationUrlSubject;
     }
 
     /**
@@ -114,7 +112,7 @@ public Single<TAccessToken> grantNewAccessToken() {
                 .take(1)
                 .retry()
                 .concatMap(this::exchangeTokenUsingCode)
-                .toSingle();
+                .singleOrError();
     }
 
     // Private

diff --git a/.../grants/OAuth2ClientCredentialsGrant.java → .../grants/OAuth2ClientCredentialsGrant.java b/.../grants/OAuth2ClientCredentialsGrant.java → .../grants/OAuth2ClientCredentialsGrant.java
@@ -1,6 +1,6 @@
-package de.rheinfabrik.heimdall.grants;
+package de.rheinfabrik.heimdall2.grants;
 
-import de.rheinfabrik.heimdall.OAuth2AccessToken;
+import de.rheinfabrik.heimdall2.OAuth2AccessToken;
 
 /**
  * Class representing the Client Credentials Grant as described in https://tools.ietf.org/html/rfc6749#section-4.4.

diff --git a/...infabrik/heimdall/grants/OAuth2Grant.java → ...nfabrik/heimdall2/grants/OAuth2Grant.java b/...infabrik/heimdall/grants/OAuth2Grant.java → ...nfabrik/heimdall2/grants/OAuth2Grant.java
@@ -1,7 +1,7 @@
-package de.rheinfabrik.heimdall.grants;
+package de.rheinfabrik.heimdall2.grants;
 
-import de.rheinfabrik.heimdall.OAuth2AccessToken;
-import rx.Single;
+import de.rheinfabrik.heimdall2.OAuth2AccessToken;
+import io.reactivex.Single;
 
 /**
  * Interface describing an OAuth2 Grant as described in https://tools.ietf.org/html/rfc6749#page-23.

diff --git a/.../heimdall/grants/OAuth2ImplicitGrant.java → ...heimdall2/grants/OAuth2ImplicitGrant.java b/.../heimdall/grants/OAuth2ImplicitGrant.java → ...heimdall2/grants/OAuth2ImplicitGrant.java
@@ -1,6 +1,6 @@
-package de.rheinfabrik.heimdall.grants;
+package de.rheinfabrik.heimdall2.grants;
 
-import de.rheinfabrik.heimdall.OAuth2AccessToken;
+import de.rheinfabrik.heimdall2.OAuth2AccessToken;
 
 /**
  * Class representing the Implicit Grant as described in https://tools.ietf.org/html/rfc6749#section-4.2.

diff --git a/...grants/OAuth2RefreshAccessTokenGrant.java → ...grants/OAuth2RefreshAccessTokenGrant.java b/...grants/OAuth2RefreshAccessTokenGrant.java → ...grants/OAuth2RefreshAccessTokenGrant.java
@@ -1,6 +1,6 @@
-package de.rheinfabrik.heimdall.grants;
+package de.rheinfabrik.heimdall2.grants;
 
-import de.rheinfabrik.heimdall.OAuth2AccessToken;
+import de.rheinfabrik.heimdall2.OAuth2AccessToken;
 
 /**
  * Class representing the Refreshing Access Token Grant as described in https://tools.ietf.org/html/rfc6749#section-6.

diff --git a/...esourceOwnerPasswordCredentialsGrant.java → ...esourceOwnerPasswordCredentialsGrant.java b/...esourceOwnerPasswordCredentialsGrant.java → ...esourceOwnerPasswordCredentialsGrant.java
@@ -1,6 +1,6 @@
-package de.rheinfabrik.heimdall.grants;
+package de.rheinfabrik.heimdall2.grants;
 
-import de.rheinfabrik.heimdall.OAuth2AccessToken;
+import de.rheinfabrik.heimdall2.OAuth2AccessToken;
 
 /**
  * Class representing the Resource Owner Password Credentials Grant as described in https://tools.ietf.org/html/rfc6749#section-4.3.

diff --git a/...dall/OAuth2AccessTokenManagerSpecs.groovy → ...all2/OAuth2AccessTokenManagerSpecs.groovy b/...dall/OAuth2AccessTokenManagerSpecs.groovy → ...all2/OAuth2AccessTokenManagerSpecs.groovy
@@ -1,8 +1,8 @@
-package de.rheinfabrik.heimdall
+package de.rheinfabrik.heimdall2
 
-import de.rheinfabrik.heimdall.grants.OAuth2Grant
-import de.rheinfabrik.heimdall.grants.OAuth2RefreshAccessTokenGrant
-import rx.Single
+import de.rheinfabrik.heimdall2.grants.OAuth2Grant
+import de.rheinfabrik.heimdall2.grants.OAuth2RefreshAccessTokenGrant
+import io.reactivex.Single
 import spock.lang.Specification
 import spock.lang.Title
 
@@ -62,7 +62,7 @@ class OAuth2AccessTokenManagerGrantNewAccessTokenSpecs extends Specification {
             Calendar calendar = Calendar.getInstance()
 
         when: "I ask for a new access token"
-            OAuth2AccessToken newToken = tokenManager.grantNewAccessToken(grant, calendar).toBlocking().value()
+            OAuth2AccessToken newToken = tokenManager.grantNewAccessToken(grant, calendar).blockingGet()
 
         then: "The access token should have the correct expiration date"
             newToken.expirationDate.timeInMillis == calendar.getTimeInMillis() + 3000
@@ -82,7 +82,7 @@ class OAuth2AccessTokenManagerGrantNewAccessTokenSpecs extends Specification {
             OAuth2AccessTokenManager tokenManager = new OAuth2AccessTokenManager<OAuth2AccessToken>(Mock(OAuth2AccessTokenStorage))
 
         when: "I ask for a new access token"
-            OAuth2AccessToken newToken = tokenManager.grantNewAccessToken(grant).toBlocking().value()
+            OAuth2AccessToken newToken = tokenManager.grantNewAccessToken(grant).blockingGet()
 
         then: "The access token should have the NO expiration date"
             newToken.expirationDate == null
@@ -104,7 +104,7 @@ class OAuth2AccessTokenManagerGrantNewAccessTokenSpecs extends Specification {
             OAuth2AccessTokenManager tokenManager = new OAuth2AccessTokenManager<OAuth2AccessToken>(storage)
 
         when: "I ask for a new access token"
-            tokenManager.grantNewAccessToken(grant).toBlocking().value()
+            tokenManager.grantNewAccessToken(grant).blockingGet()
 
         then: "The storage is asked to save the token"
             1 * storage.storeAccessToken(accessToken)
@@ -170,7 +170,7 @@ class OAuth2AccessTokenManagerGetValidAccessTokenSpecs extends Specification {
             OAuth2AccessTokenManager tokenManager = new OAuth2AccessTokenManager<OAuth2AccessToken>(storage)
 
         when: "I ask for a valid access token"
-            OAuth2AccessToken validToken = tokenManager.getValidAccessToken(grant).toBlocking().value()
+            OAuth2AccessToken validToken = tokenManager.getValidAccessToken(grant).blockingGet()
 
         then: "The I receive the non-expired token"
             validToken == accessToken

diff --git a/...ik/heimdall/OAuth2AccessTokenSpecs.groovy → ...k/heimdall2/OAuth2AccessTokenSpecs.groovy b/...ik/heimdall/OAuth2AccessTokenSpecs.groovy → ...k/heimdall2/OAuth2AccessTokenSpecs.groovy
@@ -1,4 +1,4 @@
-package de.rheinfabrik.heimdall
+package de.rheinfabrik.heimdall2
 
 import com.google.gson.Gson
 import spock.lang.Specification

diff --git a/.../OAuth2AuthorizationCodeGrantSpecs.groovy → .../OAuth2AuthorizationCodeGrantSpecs.groovy b/.../OAuth2AuthorizationCodeGrantSpecs.groovy → .../OAuth2AuthorizationCodeGrantSpecs.groovy
@@ -1,4 +1,4 @@
-package de.rheinfabrik.heimdall.grants
+package de.rheinfabrik.heimdall2.grants
 
 import spock.lang.Specification
 import spock.lang.Title

diff --git a/.../OAuth2ClientCredentialsGrantSpecs.groovy → .../OAuth2ClientCredentialsGrantSpecs.groovy b/.../OAuth2ClientCredentialsGrantSpecs.groovy → .../OAuth2ClientCredentialsGrantSpecs.groovy
@@ -1,4 +1,4 @@
-package de.rheinfabrik.heimdall.grants
+package de.rheinfabrik.heimdall2.grants
 
 import spock.lang.Specification
 import spock.lang.Title

diff --git a/...ll/grants/OAuth2ImplicitGrantSpecs.groovy → ...l2/grants/OAuth2ImplicitGrantSpecs.groovy b/...ll/grants/OAuth2ImplicitGrantSpecs.groovy → ...l2/grants/OAuth2ImplicitGrantSpecs.groovy
@@ -1,4 +1,4 @@
-package de.rheinfabrik.heimdall.grants
+package de.rheinfabrik.heimdall2.grants
 
 import spock.lang.Specification
 import spock.lang.Title

diff --git a/...OAuth2RefreshAccessTokenGrantSpecs.groovy → ...OAuth2RefreshAccessTokenGrantSpecs.groovy b/...OAuth2RefreshAccessTokenGrantSpecs.groovy → ...OAuth2RefreshAccessTokenGrantSpecs.groovy
@@ -1,4 +1,4 @@
-package de.rheinfabrik.heimdall.grants
+package de.rheinfabrik.heimdall2.grants
 
 import spock.lang.Specification
 import spock.lang.Title

diff --git a/...OwnerPasswordCredentialsGrantSpecs.groovy → ...OwnerPasswordCredentialsGrantSpecs.groovy b/...OwnerPasswordCredentialsGrantSpecs.groovy → ...OwnerPasswordCredentialsGrantSpecs.groovy
@@ -1,4 +1,4 @@
-package de.rheinfabrik.heimdall.grants
+package de.rheinfabrik.heimdall2.grants
 
 import spock.lang.Specification
 import spock.lang.Title

diff --git a/.../rheinfabrik/heimdall/EmptyTestClass.java → ...rheinfabrik/heimdall2/EmptyTestClass.java b/.../rheinfabrik/heimdall/EmptyTestClass.java → ...rheinfabrik/heimdall2/EmptyTestClass.java
@@ -1,4 +1,4 @@
-package de.rheinfabrik.heimdall;
+package de.rheinfabrik.heimdall2;
 
 public class EmptyTestClass {
     // This is an empty class. It exists only because the gradle compileTestGroovy