diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2018-10-12 19:36:04 +0530 |
|---|---|---|
| committer | حسين <zidhussein@gmail.com> | 2018-10-12 15:06:04 +0100 |
| commit | 483e8d9310aea2e8bb88f77b89c0affdb8794427 (patch) | |
| tree | 309301ce9b8ed64af37ab4a4c5c1c45bdddb2d78 /app/src/androidTest | |
| parent | b8c5dd85a6e32c47bee1bbb531846e6aef0dcb30 (diff) | |
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 <harsh@prjkt.io>
* Upgrade gradle plugin and wrapper to latest alpha
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Don't use alpha gradle plugin
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Migrate to AndroidX
https://developer.android.com/jetpack/androidx/
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Upgrade AndroidX dependencies to stable release
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Enable Jetifier
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* SelectFolderFragment: Fix build
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
Diffstat (limited to 'app/src/androidTest')
| -rw-r--r-- | app/src/androidTest/java/com/zeapo/pwdstore/DecryptTest.kt | 8 | ||||
| -rw-r--r-- | app/src/androidTest/java/com/zeapo/pwdstore/EncryptTest.kt | 18 |
2 files changed, 13 insertions, 13 deletions
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 |