Skip to content

Commit a351b39

Browse files
committed
Migrate from appcompat to androidx
Upgrade build tools version from 25.0.3 to 28.0.3.
1 parent c045914 commit a351b39

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

MaskedEditText/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ group = projectGroup
99

1010
android {
1111
compileSdkVersion 28
12-
buildToolsVersion '25.0.3'
12+
buildToolsVersion '28.0.3'
1313

1414

1515
defaultConfig {
@@ -27,7 +27,7 @@ dependencies {
2727
})
2828

2929
implementation fileTree(dir: 'libs', include: ['*.jar'])
30-
implementation 'com.android.support:appcompat-v7:28.0.0'
30+
implementation 'androidx.appcompat:appcompat:1.1.0'
3131

3232
// Rx
3333
implementation 'io.reactivex.rxjava2:rxjava:2.2.11'

MaskedEditText/src/main/java/br/com/sapereaude/maskedEditText/MaskedEditText.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.res.TypedArray;
55
import android.os.Bundle;
66
import android.os.Parcelable;
7-
import android.support.v7.widget.AppCompatEditText;
87
import android.text.Editable;
98
import android.text.SpannableStringBuilder;
109
import android.text.TextWatcher;
@@ -15,6 +14,8 @@
1514
import android.view.View;
1615
import android.widget.TextView;
1716

17+
import androidx.appcompat.widget.AppCompatEditText;
18+
1819
import io.reactivex.Flowable;
1920
import io.reactivex.processors.BehaviorProcessor;
2021

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 28
5-
buildToolsVersion '25.0.3'
5+
buildToolsVersion '28.0.3'
66

77
defaultConfig {
88
applicationId "ru.egslava.edittextphonenumber"
@@ -26,7 +26,7 @@ android {
2626

2727
dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
implementation 'com.android.support:appcompat-v7:28.0.0'
29+
implementation 'androidx.appcompat:appcompat:1.1.0'
3030
implementation project(':MaskedEditText')
3131
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2', {
3232
exclude group: 'com.android.support', module: 'support-annotations'

app/src/main/java/ru/egslava/edittextphonenumber/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package ru.egslava.edittextphonenumber;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.view.Menu;
65
import android.view.MenuItem;
76

7+
import androidx.appcompat.app.AppCompatActivity;
8+
89
import br.com.sapereaude.maskedEditText.MaskedEditText;
910

1011
public class MainActivity extends AppCompatActivity {

0 commit comments

Comments
 (0)