Skip to content

Commit 27ae4b5

Browse files
committed
Upgraded to AndroidX
1 parent f68545d commit 27ae4b5

File tree

8 files changed

+14
-69
lines changed

8 files changed

+14
-69
lines changed

.idea/vcs.xml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
targetSdkVersion 28
99
versionCode 1
1010
versionName "1.0"
11-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
11+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {
1414
release {
@@ -20,12 +20,12 @@ android {
2020

2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation 'com.android.support:appcompat-v7:28.0.0'
24-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
23+
implementation 'androidx.appcompat:appcompat:1.0.0'
24+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
2525

2626
implementation project(path: ':otpedittext2')
2727

2828
testImplementation 'junit:junit:4.12'
29-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
30-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
29+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
30+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
3131
}

app/src/androidTest/java/com/broooapps/otpedittext/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/src/main/java/com/broooapps/otpedittext/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.broooapps.otpedittext;
22

3-
import android.support.v7.app.AppCompatActivity;
3+
import androidx.appcompat.app.AppCompatActivity;
44
import android.os.Bundle;
55
import android.view.View;
66
import android.widget.EditText;

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -50,4 +50,4 @@
5050
app:layout_constraintTop_toBottomOf="@id/button" />
5151

5252

53-
</android.support.constraint.ConstraintLayout>
53+
</androidx.constraintlayout.widget.ConstraintLayout>

otpedittext2/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
versionCode 1
1111
versionName "1.0"
1212

13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414

1515
}
1616

@@ -26,8 +26,8 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828

29-
implementation 'com.android.support:appcompat-v7:28.0.0'
29+
implementation 'androidx.appcompat:appcompat:1.0.0'
3030
testImplementation 'junit:junit:4.12'
31-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
32-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
31+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
32+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
3333
}

otpedittext2/src/androidTest/java/com/broooapps/otpedittext2/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

otpedittext2/src/main/java/com/broooapps/otpedittext2/OtpEditText.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
import android.content.res.TypedArray;
1010
import android.graphics.Canvas;
1111
import android.graphics.Paint;
12-
import android.support.v4.content.ContextCompat;
13-
import android.support.v7.widget.AppCompatEditText;
12+
import androidx.core.content.ContextCompat;
13+
import androidx.appcompat.widget.AppCompatEditText;
1414
import android.text.Editable;
1515
import android.text.TextWatcher;
1616
import android.util.AttributeSet;
1717
import android.view.ActionMode;
18-
import android.view.ContextThemeWrapper;
1918
import android.view.Menu;
2019
import android.view.MenuItem;
2120
import android.view.View;

0 commit comments

Comments
 (0)