From 3376aad6f2050468ac372a3657709f34e2f4bc68 Mon Sep 17 00:00:00 2001 From: Florin Bratan Date: Sun, 10 Nov 2019 13:45:14 +0100 Subject: [PATCH] Upgraded example to AndroidX --- example/android/app/build.gradle | 6 +++--- example/android/gradle.properties | 2 ++ example/pubspec.yaml | 2 -- pubspec.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 68393b6..5207a70 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -38,7 +38,7 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -56,6 +56,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.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 1441b1d..2324ab5 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,3 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 2ef6200..2d667bf 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,8 +14,6 @@ dependencies: flutter_translate: path: ../ -dev_dependencies: - flutter: uses-material-design: true diff --git a/pubspec.yaml b/pubspec.yaml index da3ece9..a37d3de 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,6 +10,6 @@ environment: dependencies: flutter: sdk: flutter - flutter_device_locale: ^0.3.0 + flutter_device_locale: ^0.3.1 flutter: