diff --git a/cyberwow/android/app/build.gradle b/cyberwow/android/app/build.gradle index f8723f1..28ae677 100644 --- a/cyberwow/android/app/build.gradle +++ b/cyberwow/android/app/build.gradle @@ -38,7 +38,7 @@ android { targetSdkVersion 28 versionCode 22 versionName "0.7.0.0-i" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } if(project.hasProperty("RELEASE_STORE_FILE")) { @@ -78,6 +78,6 @@ flutter { dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' } diff --git a/cyberwow/android/build.gradle b/cyberwow/android/build.gradle index bb8a303..1b33616 100644 --- a/cyberwow/android/build.gradle +++ b/cyberwow/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.4.1' } } diff --git a/cyberwow/android/gradle.properties b/cyberwow/android/gradle.properties index 7be3d8b..38c8d45 100644 --- a/cyberwow/android/gradle.properties +++ b/cyberwow/android/gradle.properties @@ -1,2 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/cyberwow/android/gradle/wrapper/gradle-wrapper.properties b/cyberwow/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..ecd5e10 100644 --- a/cyberwow/android/gradle/wrapper/gradle-wrapper.properties +++ b/cyberwow/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Tue Dec 24 05:26:22 UTC 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip