diff --git a/meiqiachat/.gitignore b/meiqiachat/.gitignore index e9dc58d..430349c 100644 --- a/meiqiachat/.gitignore +++ b/meiqiachat/.gitignore @@ -1,3 +1,5 @@ +*.iml +.idea .DS_Store .dart_tool/ diff --git a/meiqiachat/.idea/libraries/Dart_SDK.xml b/meiqiachat/.idea/libraries/Dart_SDK.xml deleted file mode 100644 index cd48a0d..0000000 --- a/meiqiachat/.idea/libraries/Dart_SDK.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/meiqiachat/.idea/libraries/Flutter_for_Android.xml b/meiqiachat/.idea/libraries/Flutter_for_Android.xml deleted file mode 100644 index 2537aca..0000000 --- a/meiqiachat/.idea/libraries/Flutter_for_Android.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/meiqiachat/.idea/modules.xml b/meiqiachat/.idea/modules.xml deleted file mode 100644 index 16d6bd6..0000000 --- a/meiqiachat/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/meiqiachat/.idea/runConfigurations/example_lib_main_dart.xml b/meiqiachat/.idea/runConfigurations/example_lib_main_dart.xml deleted file mode 100644 index 5fd9159..0000000 --- a/meiqiachat/.idea/runConfigurations/example_lib_main_dart.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/meiqiachat/.idea/workspace.xml b/meiqiachat/.idea/workspace.xml deleted file mode 100644 index 0ecc48c..0000000 --- a/meiqiachat/.idea/workspace.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/meiqiachat/android/build.gradle b/meiqiachat/android/build.gradle index 80396b0..2a17104 100644 --- a/meiqiachat/android/build.gradle +++ b/meiqiachat/android/build.gradle @@ -26,7 +26,7 @@ android { defaultConfig { minSdkVersion 16 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { disable 'InvalidPackage' @@ -36,7 +36,7 @@ android { dependencies { implementation 'com.meiqia:meiqiasdk:3.5.8' - implementation 'com.android.support:support-v4:28.0.0' + implementation 'androidx.core:core:1.0.2' implementation 'com.squareup.okhttp3:okhttp:4.1.0' implementation 'com.github.bumptech.glide:glide:4.9.0' diff --git a/meiqiachat/example/android/app/build.gradle b/meiqiachat/example/android/app/build.gradle index b3bf12c..f70aa3d 100644 --- a/meiqiachat/example/android/app/build.gradle +++ b/meiqiachat/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:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/meiqiachat/meiqiachat.iml b/meiqiachat/meiqiachat.iml deleted file mode 100644 index 429df7d..0000000 --- a/meiqiachat/meiqiachat.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file