From 483e8d9310aea2e8bb88f77b89c0affdb8794427 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 12 Oct 2018 19:36:04 +0530 Subject: Migrate to AndroidX (#430) * Update gradle and external dependencies - Switch away from deprecated compile directive - Remove explicit buildToolsVersion, is defined by the gradle plugin now - Fix build in SelectFolderActivity Signed-off-by: Harsh Shandilya * Upgrade gradle plugin and wrapper to latest alpha Signed-off-by: Harsh Shandilya * Don't use alpha gradle plugin Signed-off-by: Harsh Shandilya * Migrate to AndroidX https://developer.android.com/jetpack/androidx/ Signed-off-by: Harsh Shandilya * Upgrade AndroidX dependencies to stable release Signed-off-by: Harsh Shandilya * Enable Jetifier Signed-off-by: Harsh Shandilya * SelectFolderFragment: Fix build Signed-off-by: Harsh Shandilya --- .../main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java | 6 +++--- .../main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java | 2 +- app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java | 2 +- .../main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/utils') diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java index b43b2e2d..cabc0dcf 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java @@ -3,9 +3,9 @@ package com.zeapo.pwdstore.utils; import android.annotation.SuppressLint; import android.app.Activity; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java index 1888cc7e..d155802f 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java @@ -1,6 +1,6 @@ package com.zeapo.pwdstore.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.zeapo.pwdstore.SelectFolderActivity; diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java index 3261cc58..d02adeda 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java @@ -1,6 +1,6 @@ package com.zeapo.pwdstore.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.File; diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java index 3e5e1c74..751d8559 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java @@ -1,7 +1,7 @@ package com.zeapo.pwdstore.utils; -import android.support.annotation.NonNull; -import android.support.v7.view.ActionMode; +import androidx.annotation.NonNull; +import androidx.appcompat.view.ActionMode; import android.view.Menu; import android.view.MenuItem; import android.view.View; -- cgit v1.2.3