diff --git a/app/build.gradle b/app/build.gradle index 9744b4b..166ec72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ android { defaultConfig { versionCode 1 versionName VERSION_NAME - minSdkVersion 14 + minSdkVersion 21 targetSdkVersion 28 } @@ -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' diff --git a/app/src/main/java/com/codepath/oauth/OAuthLoginActionBarActivity.java b/app/src/main/java/com/codepath/oauth/OAuthLoginActionBarActivity.java index beea737..6ced975 100755 --- a/app/src/main/java/com/codepath/oauth/OAuthLoginActionBarActivity.java +++ b/app/src/main/java/com/codepath/oauth/OAuthLoginActionBarActivity.java @@ -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 extends diff --git a/app/src/main/java/com/codepath/oauth/OAuthLoginActivity.java b/app/src/main/java/com/codepath/oauth/OAuthLoginActivity.java index 53d4a8a..64fa354 100755 --- a/app/src/main/java/com/codepath/oauth/OAuthLoginActivity.java +++ b/app/src/main/java/com/codepath/oauth/OAuthLoginActivity.java @@ -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; diff --git a/app/src/main/java/com/codepath/oauth/OAuthLoginFragment.java b/app/src/main/java/com/codepath/oauth/OAuthLoginFragment.java index 10645d2..9fe5c72 100755 --- a/app/src/main/java/com/codepath/oauth/OAuthLoginFragment.java +++ b/app/src/main/java/com/codepath/oauth/OAuthLoginFragment.java @@ -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;