Skip to content

Commit cf6dd08

Browse files
committed
update version all plugins to latest and migrate to android x
1 parent 73f3fa2 commit cf6dd08

File tree

11 files changed

+132
-112
lines changed

11 files changed

+132
-112
lines changed

.idea/libraries/Dart_Packages.xml

Lines changed: 74 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Flutter_Plugins.xml

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 15 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/app/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828
targetSdkVersion 28
2929
versionCode 1
3030
versionName "1.0"
31-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
31+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3232
}
3333

3434
signingConfigs {
@@ -59,10 +59,9 @@ flutter {
5959

6060
dependencies {
6161
testImplementation 'junit:junit:4.12'
62-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
63-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
64-
compile 'com.google.firebase:firebase-core:16.0.7'
62+
androidTestImplementation 'androidx.test:runner:1.2.0'
63+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
64+
compile 'com.google.firebase:firebase-core:17.0.0'
6565
}
6666

67-
apply plugin: 'com.google.gms.google-services'
68-
com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true
67+
apply plugin: 'com.google.gms.google-services'

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.3.2'
9-
classpath 'com.google.gms:google-services:4.2.0'
8+
classpath 'com.android.tools.build:gradle:3.4.1'
9+
classpath 'com.google.gms:google-services:4.3.0'
1010
}
1111
}
1212

android/gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx1536M
2+
android.useAndroidX=true
3+
android.enableJetifier=true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Mon Jul 08 23:03:42 ICT 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

android/gradlew

100644100755
File mode changed.

flutter_chat_demo.iml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@
6363
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.dart_tool" />
6464
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.pub" />
6565
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/build" />
66+
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/.dart_tool" />
67+
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/.pub" />
68+
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/build" />
69+
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/.dart_tool" />
70+
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/.pub" />
71+
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/build" />
6672
</content>
6773
<orderEntry type="sourceFolder" forTests="false" />
6874
<orderEntry type="library" name="Dart SDK" level="project" />

pubspec.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ packages:
1414
name: boolean_selector
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.0.5"
17+
version: "1.0.4"
1818
cached_network_image:
1919
dependency: "direct main"
2020
description:
@@ -35,7 +35,7 @@ packages:
3535
name: cloud_firestore
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "0.8.2+3"
38+
version: "0.12.7"
3939
collection:
4040
dependency: transitive
4141
description:
@@ -70,21 +70,21 @@ packages:
7070
name: firebase_auth
7171
url: "https://pub.dartlang.org"
7272
source: hosted
73-
version: "0.7.0"
73+
version: "0.11.1+7"
7474
firebase_core:
7575
dependency: transitive
7676
description:
7777
name: firebase_core
7878
url: "https://pub.dartlang.org"
7979
source: hosted
80-
version: "0.2.5+1"
80+
version: "0.4.0+6"
8181
firebase_storage:
8282
dependency: "direct main"
8383
description:
8484
name: firebase_storage
8585
url: "https://pub.dartlang.org"
8686
source: hosted
87-
version: "1.0.4"
87+
version: "3.0.2"
8888
flutter:
8989
dependency: "direct main"
9090
description: flutter
@@ -115,7 +115,7 @@ packages:
115115
name: google_sign_in
116116
url: "https://pub.dartlang.org"
117117
source: hosted
118-
version: "3.2.4"
118+
version: "4.0.2"
119119
http:
120120
dependency: transitive
121121
description:
@@ -136,7 +136,7 @@ packages:
136136
name: image_picker
137137
url: "https://pub.dartlang.org"
138138
source: hosted
139-
version: "0.4.12+1"
139+
version: "0.6.0+11"
140140
intl:
141141
dependency: "direct main"
142142
description:
@@ -192,7 +192,7 @@ packages:
192192
name: shared_preferences
193193
url: "https://pub.dartlang.org"
194194
source: hosted
195-
version: "0.4.3"
195+
version: "0.5.3+2"
196196
sky_engine:
197197
dependency: transitive
198198
description: flutter
@@ -277,4 +277,4 @@ packages:
277277
version: "2.0.8"
278278
sdks:
279279
dart: ">=2.2.2 <3.0.0"
280-
flutter: ">=1.2.1 <2.0.0"
280+
flutter: ">=1.5.0 <2.0.0"

pubspec.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ dependencies:
66
sdk: flutter
77

88
cupertino_icons: ^0.1.2
9-
firebase_auth: 0.7.0
10-
google_sign_in: 3.2.4
11-
cloud_firestore: 0.8.2+3
9+
firebase_auth: 0.11.1+7
10+
google_sign_in: 4.0.2
11+
cloud_firestore: 0.12.7
1212
fluttertoast: ^2.0.7
13-
image_picker: 0.4.12+1
14-
shared_preferences: 0.4.3
15-
firebase_storage: 1.0.4
13+
image_picker: 0.6.0+11
14+
shared_preferences: 0.5.3+2
15+
firebase_storage: 3.0.2
1616
cached_network_image: ^1.0.0
1717
intl: ^0.15.7
1818

0 commit comments

Comments
 (0)