Navigation Menu

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.

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

Jump to bottom

Migrate support lib dependencies to AndroidX. #332

Merged
merged 1 commit into from May 11, 2019
Merged

Migrate support lib dependencies to AndroidX. #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app-kotlin/build.gradle
View file
Open in desktop
Expand Up @@ -53,7 +53,8 @@ ktlint {
dependencies {
implementation project(':library')
implementation deps.kotlinstdlib
implementation deps.appcompatv7
implementation deps.annotation
implementation deps.appcompat
}

buildscript {
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ android {

dependencies {
implementation project(':library')
implementation deps.appcompatv7
implementation deps.appcompat
}

buildscript {
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Expand Up @@ -8,14 +8,14 @@ ext {
compileSdkVersion = 28
buildToolsVersion = '28.0.3'
gradleVersion = '4.6'
kotlinVersion = '1.2.70'
kotlinVersion = '1.3.31'
detektVersion = '1.0.0.RC6-1'
}

ext.deps = [rxjava2 : 'io.reactivex.rxjava2:rxjava:2.2.4',
rxandroid2 : 'io.reactivex.rxjava2:rxandroid:2.1.0',
supportannotations: 'com.android.support:support-annotations:28.0.0',
appcompatv7 : 'com.android.support:appcompat-v7:28.0.0',
ext.deps = [rxjava2 : 'io.reactivex.rxjava2:rxjava:2.2.8',
rxandroid2 : 'io.reactivex.rxjava2:rxandroid:2.1.1',
annotation : 'androidx.annotation:annotation:1.0.2',
appcompat : 'androidx.appcompat:appcompat:1.0.2',
junit : 'junit:junit:4.12',
truth : 'com.google.truth:truth:0.42',
robolectric : 'org.robolectric:robolectric:4.1',
Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ jacocoAndroidUnitTestReport {
dependencies {
api deps.rxjava2
api deps.rxandroid2
implementation deps.supportannotations
implementation deps.annotation

testImplementation deps.junit
testImplementation deps.truth
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/github/pwittchen/reactivenetwork/library/rx2/Connectivity.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

/**
* Connectivity class represents current connectivity status. It wraps NetworkInfo object.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/github/pwittchen/reactivenetwork/library/rx2/ReactiveNetwork.java
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

import android.Manifest;
import android.content.Context;
import android.support.annotation.RequiresPermission;
import androidx.annotation.RequiresPermission;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...venetwork/library/rx2/network/observing/strategy/MarshmallowNetworkObservingStrategy.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.os.PowerManager;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;
import com.github.pwittchen.reactivenetwork.library.rx2.Connectivity;
import com.github.pwittchen.reactivenetwork.library.rx2.network.observing.NetworkObservingStrategy;
Expand Down
2 changes: 1 addition & 1 deletion ...y/src/test/java/com/github/pwittchen/reactivenetwork/library/rx2/ReactiveNetworkTest.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
import android.app.Application;
import android.content.Context;
import android.net.NetworkInfo;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.DefaultErrorHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...ittchen/reactivenetwork/library/rx2/internet/observing/InternetObservingSettingsTest.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package com.github.pwittchen.reactivenetwork.library.rx2.internet.observing;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.DefaultErrorHandler;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler;
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.SocketInternetObservingStrategy;
Expand Down