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 --- .../androidTest/java/com/zeapo/pwdstore/DecryptTest.kt | 8 ++++---- .../androidTest/java/com/zeapo/pwdstore/EncryptTest.kt | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'app/src/androidTest/java') diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/DecryptTest.kt b/app/src/androidTest/java/com/zeapo/pwdstore/DecryptTest.kt index 4de3de88..98921d17 100644 --- a/app/src/androidTest/java/com/zeapo/pwdstore/DecryptTest.kt +++ b/app/src/androidTest/java/com/zeapo/pwdstore/DecryptTest.kt @@ -5,10 +5,10 @@ import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.os.SystemClock -import android.support.test.InstrumentationRegistry -import android.support.test.filters.LargeTest -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.InstrumentationRegistry +import androidx.test.filters.LargeTest +import androidx.test.rule.ActivityTestRule +import androidx.test.runner.AndroidJUnit4 import android.util.Log import com.zeapo.pwdstore.crypto.PgpActivity import kotlinx.android.synthetic.main.decrypt_layout.* diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/EncryptTest.kt b/app/src/androidTest/java/com/zeapo/pwdstore/EncryptTest.kt index 91ac9ea0..a86db5ee 100644 --- a/app/src/androidTest/java/com/zeapo/pwdstore/EncryptTest.kt +++ b/app/src/androidTest/java/com/zeapo/pwdstore/EncryptTest.kt @@ -3,15 +3,15 @@ package com.zeapo.pwdstore import android.annotation.SuppressLint import android.content.Context import android.content.Intent -import android.support.test.InstrumentationRegistry -import android.support.test.espresso.Espresso.onView -import android.support.test.espresso.action.ViewActions.* -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.ViewMatchers.withId -import android.support.test.espresso.matcher.ViewMatchers.withText -import android.support.test.filters.LargeTest -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.InstrumentationRegistry +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.action.ViewActions.* +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.espresso.matcher.ViewMatchers.withText +import androidx.test.filters.LargeTest +import androidx.test.rule.ActivityTestRule +import androidx.test.runner.AndroidJUnit4 import com.zeapo.pwdstore.crypto.PgpActivity import org.apache.commons.io.FileUtils import org.apache.commons.io.IOUtils -- cgit v1.2.3