Skip to content

Bump to AndroidX #42

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

Merged
rogerhu merged 1 commit into from
Aug 14, 2019
Merged

Bump to AndroidX #42

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
defaultConfig {
versionCode 1
versionName VERSION_NAME
minSdkVersion 14
minSdkVersion 21
targetSdkVersion 28
}

Expand Down Expand Up @@ -114,8 +114,7 @@ ext {
}

dependencies {
api "com.android.support:appcompat-v7:${supportVersion}"
api "com.android.support:support-v4:${supportVersion}"
api "androidx.appcompat:appcompat:1.0.2"
api 'com.loopj.android:android-async-http:1.4.9'
implementation files('libs/codepath-utils.jar')
api 'com.github.scribejava:scribejava-apis:4.1.1'
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/codepath/oauth/OAuthLoginActionBarActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;

import androidx.appcompat.app.AppCompatActivity;


// This is the ActionBarActivity supportv7 version of LoginActivity
public abstract class OAuthLoginActionBarActivity<T extends OAuthBaseClient> extends
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/codepath/oauth/OAuthLoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v4.app.FragmentActivity;

import androidx.fragment.app.FragmentActivity;

import com.codepath.utils.GenericsUtil;

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/codepath/oauth/OAuthLoginFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;

import androidx.fragment.app.Fragment;

import com.codepath.utils.GenericsUtil;

Expand Down