gradle 4.10.2 包添加AndroidX配置

Sugers3 · Apr 30, 2019 · 78c42ba · 78c42ba
1 parent 922df69
commit 78c42ba
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -47,10 +47,10 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.alibaba.fluttergo"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
@@ -76,8 +76,8 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     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.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     //firebase
     implementation 'com.google.firebase:firebase-core:16.0.8'
     //Crashlytics SDK

diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
@@ -6,7 +6,6 @@
     <!-- You can insert your own image assets here -->
     <item>
         <bitmap
-            android:gravity="center"
-            android:src="@mipmap/splash" />
+            android:src="@drawable/splash" />
     </item>
 </layer-list>
diff --git a/android/app/src/main/res/mipmap-xxhdpi/splash.png b/android/app/src/main/res/mipmap-xxhdpi/splash.png
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.0'
     repositories {
         google()
         jcenter()
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         //firebase
         classpath 'com.google.gms:google-services:4.2.0'
         //Crashlytics SDK

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/pubspec.lock b/pubspec.lock
@@ -77,7 +77,7 @@ packages:
       name: firebase_analytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1+2"
+    version: "1.2.0+1"
   firebase_core:
     dependency: "direct main"
     description:
@@ -185,7 +185,7 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.2"
+    version: "0.4.3"
   sky_engine:
     dependency: transitive
     description: flutter

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -26,13 +26,13 @@ dependencies:
   flutter_markdown: ^0.2.0
   url_launcher: ^5.0.2
   # 本地存储、收藏功能
-  shared_preferences: ^0.5.2
+  shared_preferences: ^0.4.3
   dio: ^1.0.6
   flutter_webview_plugin: ^0.3.4
   # 日期格式化
   intl: 0.15.7
   city_pickers: ^0.0.1
-  firebase_analytics: ^2.0.2+1
+  firebase_analytics: ^1.1.0
   #firebase_auth: ^0.8.3 #auth
   firebase_core: ^0.3.4 # add dependency for Firebase Core