Skip to content

Commit 894c770

Browse files
committed
update to AndroidX
1 parent c78b6d0 commit 894c770

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
targetSdkVersion 29
2222
versionCode 1
2323
versionName "1.0"
24-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
24+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2525
}
2626
buildTypes {
2727
release {
@@ -55,9 +55,9 @@ dependencies {
5555
implementation fileTree(dir: 'libs', include: ['*.jar'])
5656
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5757
implementation "com.stringcare:library:$stringcare_version"
58-
implementation 'com.android.support:appcompat-v7:28.0.0'
59-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
58+
implementation 'androidx.appcompat:appcompat:1.1.0'
59+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
6060
testImplementation 'junit:junit:4.12'
61-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
62-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
61+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
62+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
6363
}

app/src/androidTest/java/com/stringcare/sample/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.stringcare.sample
22

3-
import android.support.test.InstrumentationRegistry
4-
import android.support.test.runner.AndroidJUnit4
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
55

66
import org.junit.Test
77
import org.junit.runner.RunWith

app/src/main/java/com/stringcare/sample/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.stringcare.sample
22

3-
import android.support.v7.app.AppCompatActivity
43
import android.os.Bundle
4+
import androidx.appcompat.app.AppCompatActivity
55
import com.stringcare.library.*
66
import kotlinx.android.synthetic.main.activity_main.*
77

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
1313
# org.gradle.parallel=true
1414
# Kotlin code style for this project: "official" or "obsolete":
1515
kotlin.code.style=official
16+
android.useAndroidX=true
17+
android.enableJetifier=true

0 commit comments

Comments
 (0)