Skip to content

Commit 0f5088d

Browse files
author
Nino Handler
committed
Migrated to androidX
1 parent ea162be commit 0f5088d

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
versionCode versionCode
1414
versionName "${versionName}"
1515

16-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
1818
buildTypes {
1919
release {
@@ -29,12 +29,12 @@ android {
2929
dependencies {
3030
implementation fileTree(dir: 'libs', include: ['*.jar'])
3131
implementation project(':securestoragelibrary')
32-
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
32+
implementation 'androidx.appcompat:appcompat:1.0.2'
3333
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
34-
androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.0.1', {
34+
androidTestImplementation ('androidx.test.espresso:espresso-core:3.1.0', {
3535
exclude group: 'com.android.support', module: 'support-annotations'
3636
})
37-
androidTestImplementation ('com.android.support.test:runner:1.0.1', {
37+
androidTestImplementation ('androidx.test.ext:junit:1.1.0', {
3838
exclude group: 'com.android.support', module: 'support-annotations'
3939
})
4040
}

app/src/androidTest/java/de/adorsys/android/securestoragetest/EncryptDecryptTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package de.adorsys.android.securestoragetest;
22

3-
import android.support.test.rule.ActivityTestRule;
4-
import android.support.test.runner.AndroidJUnit4;
3+
import androidx.test.rule.ActivityTestRule;
4+
import androidx.test.ext.junit.runners.AndroidJUnit4;
55
import android.util.Log;
66

77
import org.junit.Before;
@@ -12,12 +12,12 @@
1212
import de.adorsys.android.securestoragelibrary.SecurePreferences;
1313
import de.adorsys.android.securestoragelibrary.SecureStorageException;
1414

15-
import static android.support.test.espresso.Espresso.onView;
16-
import static android.support.test.espresso.action.ViewActions.click;
17-
import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
18-
import static android.support.test.espresso.action.ViewActions.scrollTo;
19-
import static android.support.test.espresso.action.ViewActions.typeText;
20-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
15+
import static androidx.test.espresso.Espresso.onView;
16+
import static androidx.test.espresso.action.ViewActions.click;
17+
import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
18+
import static androidx.test.espresso.action.ViewActions.scrollTo;
19+
import static androidx.test.espresso.action.ViewActions.typeText;
20+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2121
import static org.junit.Assert.assertEquals;
2222
import static org.junit.Assert.assertNotNull;
2323
import static org.junit.Assert.assertTrue;

app/src/main/java/de/adorsys/android/securestoragetest/MainActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import android.content.Intent
2020
import android.net.Uri
2121
import android.os.Build
2222
import android.os.Bundle
23-
import android.support.v7.app.AppCompatActivity
23+
import androidx.appcompat.app.AppCompatActivity
2424
import android.text.Html
2525
import android.text.Spanned
2626
import android.text.TextUtils

securestoragelibrary/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ android {
2929

3030
dependencies {
3131
implementation fileTree(dir: 'libs', include: ['*.jar'])
32-
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
32+
implementation 'androidx.appcompat:appcompat:1.0.2'
3333
}
3434

3535
ext {

securestoragelibrary/src/main/java/de/adorsys/android/securestoragelibrary/KeystoreTool.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import android.os.Build.VERSION;
2222
import android.os.Build.VERSION_CODES;
2323
import android.security.KeyPairGeneratorSpec;
24-
import android.support.annotation.NonNull;
25-
import android.support.annotation.Nullable;
24+
import androidx.annotation.NonNull;
25+
import androidx.annotation.Nullable;
2626
import android.util.Base64;
2727
import android.util.Log;
2828
import android.view.View;

securestoragelibrary/src/main/java/de/adorsys/android/securestoragelibrary/SecurePreferences.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import android.content.Context;
2020
import android.content.SharedPreferences;
21-
import android.support.annotation.NonNull;
22-
import android.support.annotation.Nullable;
21+
import androidx.annotation.NonNull;
22+
import androidx.annotation.Nullable;
2323
import android.text.TextUtils;
2424

2525
import java.util.HashSet;

0 commit comments

Comments
 (0)