Skip to content

Commit 45f6dd7

Browse files
committed
The project was migrated to androidX
1 parent bbe890f commit 45f6dd7

7 files changed

Lines changed: 18 additions & 14 deletions

File tree

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 {
@@ -25,11 +25,11 @@ android {
2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727
testImplementation 'junit:junit:4.12'
28-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
29-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
28+
androidTestImplementation 'androidx.test:runner:1.1.1'
29+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
3030

31-
implementation 'com.android.support:appcompat-v7:28.0.0'
32-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
31+
implementation 'androidx.appcompat:appcompat:1.0.2'
32+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3333

3434
implementation project(':support')
3535
}

app/src/androidTest/java/com/github/nikartm/stripedprocessbutton/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.github.nikartm.stripedprocessbutton;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.runner.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

app/src/main/java/com/github/nikartm/stripedprocessbutton/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.nikartm.stripedprocessbutton;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.widget.Button;
66

77
import com.github.nikartm.support.StripedProcessButton;

gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ org.gradle.jvmargs=-Xmx1536m
1111
# This option should only be used with decoupled projects. More details, visit
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1313
# org.gradle.parallel=true
14+
15+
# Use AndroidX
16+
android.enableJetifier=true
17+
android.useAndroidX=true

support/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
minSdkVersion 21
99
targetSdkVersion 28
1010
versionCode 1
11-
versionName "1.0"
11+
versionName "1.0.1"
1212
}
1313

1414
buildTypes {
@@ -34,7 +34,7 @@ publish {
3434
userOrg = 'nikart'
3535
groupId = 'com.github.nikartm'
3636
artifactId = 'process-button'
37-
publishVersion = '1.0.1'
37+
publishVersion = android.defaultConfig.versionName
3838
desc = 'Android library. Animated striped button to show loading process.'
3939
licences = ['Apache-2.0']
4040
uploadName='StripedProcessButton'
@@ -43,6 +43,6 @@ publish {
4343

4444
dependencies {
4545
implementation fileTree(dir: 'libs', include: ['*.jar'])
46-
implementation 'com.android.support:appcompat-v7:28.0.0'
46+
implementation 'androidx.appcompat:appcompat:1.0.2'
4747
testImplementation 'junit:junit:4.12'
4848
}

support/src/main/java/com/github/nikartm/support/AnimatedStripedDrawable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import android.graphics.RectF;
1313
import android.graphics.Shader;
1414
import android.graphics.drawable.Drawable;
15-
import android.support.annotation.NonNull;
16-
import android.support.annotation.Nullable;
15+
import androidx.annotation.NonNull;
16+
import androidx.annotation.Nullable;
1717

1818
/**
1919
* Animated striped drawable

support/src/main/java/com/github/nikartm/support/StripedProcessButton.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Context;
44
import android.graphics.Canvas;
55
import android.graphics.drawable.Animatable;
6-
import android.support.v7.widget.AppCompatButton;
6+
import androidx.appcompat.widget.AppCompatButton;
77
import android.util.AttributeSet;
88

99
import com.github.nikartm.support.constant.Constants;

0 commit comments

Comments
 (0)