Browse Source

update gradle and androidx

Caijinglong 5 years ago
parent
commit
f20d8b45bc

+ 4
- 4
example/android/app/build.gradle View File

25
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
25
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26
 
26
 
27
 android {
27
 android {
28
-    compileSdkVersion 27
28
+    compileSdkVersion 28
29
 
29
 
30
     lintOptions {
30
     lintOptions {
31
         disable 'InvalidPackage'
31
         disable 'InvalidPackage'
35
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
35
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
36
         applicationId "com.example.example"
36
         applicationId "com.example.example"
37
         minSdkVersion 16
37
         minSdkVersion 16
38
-        targetSdkVersion 27
38
+        targetSdkVersion 28
39
         versionCode flutterVersionCode.toInteger()
39
         versionCode flutterVersionCode.toInteger()
40
         versionName flutterVersionName
40
         versionName flutterVersionName
41
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
41
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
56
 
56
 
57
 dependencies {
57
 dependencies {
58
     testImplementation 'junit:junit:4.12'
58
     testImplementation 'junit:junit:4.12'
59
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
60
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
59
+//    androidTestImplementation 'com.android.support.test:runner:1.0.2'
60
+//    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
61
 }
61
 }

+ 1
- 1
example/android/build.gradle View File

5
     }
5
     }
6
 
6
 
7
     dependencies {
7
     dependencies {
8
-        classpath 'com.android.tools.build:gradle:3.1.2'
8
+        classpath 'com.android.tools.build:gradle:3.3.1'
9
     }
9
     }
10
 }
10
 }
11
 
11
 

+ 2
- 0
example/android/gradle.properties View File

1
 org.gradle.jvmargs=-Xmx1536M
1
 org.gradle.jvmargs=-Xmx1536M
2
+android.enableJetifier=true
3
+android.useAndroidX=true

+ 1
- 1
example/android/gradle/wrapper/gradle-wrapper.properties View File

3
 distributionPath=wrapper/dists
3
 distributionPath=wrapper/dists
4
 zipStoreBase=GRADLE_USER_HOME
4
 zipStoreBase=GRADLE_USER_HOME
5
 zipStorePath=wrapper/dists
5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

+ 6
- 4
pubspec.lock View File

70
   photo_manager:
70
   photo_manager:
71
     dependency: "direct main"
71
     dependency: "direct main"
72
     description:
72
     description:
73
-      name: photo_manager
74
-      url: "https://pub.flutter-io.cn"
75
-    source: hosted
76
-    version: "0.2.1"
73
+      path: "."
74
+      ref: "8ef0bf9047cdd86e2331f0db8d15c4c50f35610d"
75
+      resolved-ref: "8ef0bf9047cdd86e2331f0db8d15c4c50f35610d"
76
+      url: "https://github.com/CaiJingLong/flutter_photo_manager.git"
77
+    source: git
78
+    version: "0.3.0"
77
   quiver:
79
   quiver:
78
     dependency: transitive
80
     dependency: transitive
79
     description:
81
     description:

+ 5
- 5
pubspec.yaml View File

11
   flutter:
11
   flutter:
12
     sdk: flutter
12
     sdk: flutter
13
 
13
 
14
-  photo_manager: ^0.2.1
15
-  # photo_manager:
16
-  #   git:
17
-  #     url: https://github.com/CaiJingLong/flutter_photo_manager.git
18
-  #     ref: 29d844b2c4594d7e524d0169658bc4f3b9ef2ddc
14
+  # photo_manager: ^0.2.1
15
+  photo_manager:
16
+    git:
17
+      url: https://github.com/CaiJingLong/flutter_photo_manager.git
18
+      ref: 8ef0bf9047cdd86e2331f0db8d15c4c50f35610d
19
   # photo_manager:
19
   # photo_manager:
20
   #   path: ../flutter_photo_manager
20
   #   path: ../flutter_photo_manager
21
 
21