Skip to content

Commit 54579dc

Browse files
committed
migrate to AndroidX
1 parent f634044 commit 54579dc

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

android/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {
3131
}
3232

3333
android {
34-
compileSdkVersion 27
34+
compileSdkVersion 28
3535

3636
lintOptions {
3737
disable 'InvalidPackage'
@@ -40,10 +40,10 @@ android {
4040
defaultConfig {
4141
applicationId "tech.soit.tetris"
4242
minSdkVersion 16
43-
targetSdkVersion 27
43+
targetSdkVersion 28
4444
versionCode flutterVersionCode.toInteger()
4545
versionName flutterVersionName
46-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
46+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4747
}
4848

4949
signingConfigs {
@@ -71,6 +71,6 @@ flutter {
7171

7272
dependencies {
7373
testImplementation 'junit:junit:4.12'
74-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
75-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
74+
androidTestImplementation 'androidx.test:runner:1.1.1'
75+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
7676
}

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.2.1'
8+
classpath 'com.android.tools.build:gradle:3.4.0'
99
}
1010
}
1111

android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.enableJetifier=true
3+
android.useAndroidX=true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Wed May 15 22:14:27 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

0 commit comments

Comments
 (0)