Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rxJava #208

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update rxJava #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75d100c
refactor: upgrade rx2 to rx3, upgrade gradle plugin and add support t…
alejandroBrb Jun 24, 2021
f809e30
chore: validate global env var
alejandroBrb Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions android-reactive-location/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

//TODO: local maven deployment

dependencies {
compile 'com.google.android.gms:play-services-location:11.0.4'
compile 'com.google.android.gms:play-services-places:11.0.4'
compile 'io.reactivex.rxjava2:rxjava:2.0.5'
api 'com.google.android.gms:play-services-location:18.0.0'
api 'com.google.android.gms:play-services-places:17.0.0'
implementation "io.reactivex.rxjava3:rxjava:3.0.13"
}

// Comment this to deploy to local maven repository
Expand Down
12 changes: 6 additions & 6 deletions ...ive-location/src/main/java/pl/charmas/android/reactivelocation2/DataBufferObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.google.android.gms.common.data.AbstractDataBuffer;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.disposables.Disposables;
import io.reactivex.functions.Action;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.functions.Action;


/**
Expand All @@ -33,7 +33,7 @@ public void subscribe(final ObservableEmitter<T> emitter) {
for (T item : buffer) {
emitter.onNext(item);
}
emitter.setDisposable(Disposables.fromAction(new Action() {
emitter.setDisposable(Disposable.fromAction(new Action() {
@Override
public void run() throws Exception {
buffer.release();
Expand Down
9 changes: 5 additions & 4 deletions ...location/src/main/java/pl/charmas/android/reactivelocation2/ReactiveLocationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import android.location.Address;
import android.location.Location;
import android.os.Handler;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresPermission;

import androidx.annotation.Nullable;
import androidx.annotation.RequiresPermission;

import com.google.android.gms.common.api.Api;
import com.google.android.gms.common.api.GoogleApiClient;
Expand All @@ -33,8 +34,8 @@
import java.util.List;
import java.util.Locale;

import io.reactivex.Observable;
import io.reactivex.functions.Function;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.functions.Function;
import pl.charmas.android.reactivelocation2.observables.GoogleAPIClientObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;
Expand Down
3 changes: 2 additions & 1 deletion ...main/java/pl/charmas/android/reactivelocation2/ReactiveLocationProviderConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package pl.charmas.android.reactivelocation2;

import android.os.Handler;
import android.support.annotation.Nullable;

import androidx.annotation.Nullable;

/**
* Configuration for location provider. Pleas use builder to create an instance.
Expand Down
14 changes: 7 additions & 7 deletions ...main/java/pl/charmas/android/reactivelocation2/observables/BaseObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.api.Api;
Expand All @@ -12,11 +13,10 @@
import java.util.Arrays;
import java.util.List;

import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.disposables.Disposables;
import io.reactivex.functions.Action;

import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.functions.Action;

public abstract class BaseObservableOnSubscribe<T> implements ObservableOnSubscribe<T> {
private final Context ctx;
Expand All @@ -41,7 +41,7 @@ public void subscribe(ObservableEmitter<T> emitter) throws Exception {
}
}

emitter.setDisposable(Disposables.fromAction(new Action() {
emitter.setDisposable(Disposable.fromAction(new Action() {
@Override
public void run() throws Exception {
onDisposed(apiClient);
Expand Down
5 changes: 3 additions & 2 deletions ...l/charmas/android/reactivelocation2/observables/GoogleAPIClientObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
import com.google.android.gms.common.api.Api;
import com.google.android.gms.common.api.GoogleApiClient;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;


public class GoogleAPIClientObservableOnSubscribe extends BaseObservableOnSubscribe<GoogleApiClient> {

Expand Down
7 changes: 4 additions & 3 deletions .../main/java/pl/charmas/android/reactivelocation2/observables/ObservableEmitterWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package pl.charmas.android.reactivelocation2.observables;

import io.reactivex.ObservableEmitter;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;

import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;

public class ObservableEmitterWrapper<T> implements Observer<T> {
private final ObservableEmitter<T> emitter;
Expand Down
11 changes: 6 additions & 5 deletions ...ion/src/main/java/pl/charmas/android/reactivelocation2/observables/ObservableFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package pl.charmas.android.reactivelocation2.observables;

import io.reactivex.Observable;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.ObservableSource;
import io.reactivex.ObservableTransformer;
import io.reactivex.functions.BiPredicate;

import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
import io.reactivex.rxjava3.core.ObservableSource;
import io.reactivex.rxjava3.core.ObservableTransformer;
import io.reactivex.rxjava3.functions.BiPredicate;

public class ObservableFactory {
private final ObservableContext context;
Expand Down
12 changes: 6 additions & 6 deletions .../pl/charmas/android/reactivelocation2/observables/PendingResultObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package pl.charmas.android.reactivelocation2.observables;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.google.android.gms.common.api.PendingResult;
import com.google.android.gms.common.api.Result;
import com.google.android.gms.common.api.ResultCallback;

import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.disposables.Disposables;
import io.reactivex.functions.Action;
import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.functions.Action;

public class PendingResultObservableOnSubscribe<T extends Result> implements ObservableOnSubscribe<T> {
private final PendingResult<T> result;
Expand All @@ -32,7 +32,7 @@ public void onResult(@NonNull T t) {
}
});

emitter.setDisposable(Disposables.fromAction(new Action() {
emitter.setDisposable(Disposable.fromAction(new Action() {
@Override
public void run() {
if (!complete) {
Expand Down
4 changes: 2 additions & 2 deletions .../android/reactivelocation2/observables/activity/ActivityUpdatesObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.google.android.gms.location.ActivityRecognition;
import com.google.android.gms.location.ActivityRecognitionResult;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;

Expand Down
5 changes: 3 additions & 2 deletions ...armas/android/reactivelocation2/observables/geocode/FallbackReverseGeocodeObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
import java.util.List;
import java.util.Locale;

import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableOnSubscribe;


class FallbackReverseGeocodeObservable implements ObservableOnSubscribe<List<Address>> {
private final Locale locale;
Expand Down
9 changes: 5 additions & 4 deletions ...main/java/pl/charmas/android/reactivelocation2/observables/geocode/GeocodeObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
import android.content.Context;
import android.location.Address;
import android.location.Geocoder;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import com.google.android.gms.maps.model.LatLngBounds;

import java.io.IOException;
import java.util.List;
import java.util.Locale;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;

public class GeocodeObservable implements ObservableOnSubscribe<List<Address>> {
Expand Down
9 changes: 4 additions & 5 deletions ...va/pl/charmas/android/reactivelocation2/observables/geocode/ReverseGeocodeObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
import java.util.List;
import java.util.Locale;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
import io.reactivex.rxjava3.schedulers.Schedulers;
import pl.charmas.android.reactivelocation2.observables.ObservableEmitterWrapper;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;


public class ReverseGeocodeObservable implements ObservableOnSubscribe<List<Address>> {
private final Context ctx;
private final Locale locale;
Expand Down
7 changes: 4 additions & 3 deletions ...rmas/android/reactivelocation2/observables/geofence/AddGeofenceObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package pl.charmas.android.reactivelocation2.observables.geofence;

import android.app.PendingIntent;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.ResultCallback;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.location.GeofencingRequest;
import com.google.android.gms.location.LocationServices;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.BaseLocationObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;
Expand Down
5 changes: 3 additions & 2 deletions ...ivelocation2/observables/geofence/RemoveGeofenceByPendingIntentObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package pl.charmas.android.reactivelocation2.observables.geofence;

import android.app.PendingIntent;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.ResultCallback;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.location.LocationServices;

import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.StatusException;

Expand Down
4 changes: 2 additions & 2 deletions ...s/android/reactivelocation2/observables/geofence/RemoveGeofenceObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import java.util.List;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.BaseLocationObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;
Expand Down
4 changes: 2 additions & 2 deletions ...reactivelocation2/observables/geofence/RemoveGeofenceRequestIdsObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.charmas.android.reactivelocation2.observables.geofence;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.ResultCallback;
Expand All @@ -9,7 +9,7 @@

import java.util.List;

import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.StatusException;

Expand Down
7 changes: 4 additions & 3 deletions ...reactivelocation2/observables/location/AddLocationIntentUpdatesObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package pl.charmas.android.reactivelocation2.observables.location;

import android.app.PendingIntent;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.ResultCallback;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.location.LocationRequest;
import com.google.android.gms.location.LocationServices;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.BaseLocationObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;
Expand Down
4 changes: 2 additions & 2 deletions ...ndroid/reactivelocation2/observables/location/LastKnownLocationObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.location.LocationServices;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.BaseLocationObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;
Expand Down
4 changes: 2 additions & 2 deletions .../android/reactivelocation2/observables/location/LocationUpdatesObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import java.lang.ref.WeakReference;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import pl.charmas.android.reactivelocation2.observables.BaseLocationObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;
Expand Down
13 changes: 7 additions & 6 deletions ...mas/android/reactivelocation2/observables/location/MockLocationObservableOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package pl.charmas.android.reactivelocation2.observables.location;

import android.location.Location;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.ResultCallback;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.location.LocationServices;

import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Action;
import io.reactivex.functions.Consumer;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.ObservableEmitter;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.functions.Action;
import io.reactivex.rxjava3.functions.Consumer;
import pl.charmas.android.reactivelocation2.observables.BaseLocationObservableOnSubscribe;
import pl.charmas.android.reactivelocation2.observables.ObservableContext;
import pl.charmas.android.reactivelocation2.observables.ObservableFactory;
Expand Down
Loading