From 09c3244f4750557b1d5e86435e095ef2b65ffceb Mon Sep 17 00:00:00 2001 From: Chen Asraf Date: Tue, 5 Mar 2019 21:51:24 +0200 Subject: [PATCH] fixed create new character + build stuff --- .../executionHistory/executionHistory.bin | Bin 0 -> 18706 bytes .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .gradle/5.1.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/5.1.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/5.1.1/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/vcs-1/gc.properties | 0 .gradle/workspace-id.txt | Bin 0 -> 28 bytes .gradle/workspace-id.txt.lock | Bin 0 -> 17 bytes .idea/libraries/Dart_Packages.xml | 112 ++++++++++++++---- .idea/libraries/Flutter_Plugins.xml | 12 +- .idea/workspace.xml | 59 +++------ .vscode/launch.json | 9 +- android/app/build.gradle | 7 +- android/build.gradle | 4 +- pubspec.lock | 8 +- pubspec.yaml | 6 +- 18 files changed, 138 insertions(+), 81 deletions(-) create mode 100644 .gradle/5.1.1/executionHistory/executionHistory.bin create mode 100644 .gradle/5.1.1/executionHistory/executionHistory.lock create mode 100644 .gradle/5.1.1/fileChanges/last-build.bin create mode 100644 .gradle/5.1.1/fileHashes/fileHashes.lock create mode 100644 .gradle/5.1.1/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/vcs-1/gc.properties create mode 100644 .gradle/workspace-id.txt create mode 100644 .gradle/workspace-id.txt.lock diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..8d359aa8b07746dd6b25b99b6a268fb3722e57a7 GIT binary patch literal 18706 zcmeI%u}Z^G6vpuzH;Z7GLhucQauL(wEOrpwtewkkl7`gijkyIt#*1sp{F2Tt;F4upGuYX(Y%?XRCw>*}l{2>}EUKmY**5I_I{1Q0*~0R#|0 z009ILKmY**{)@m!F4Af)6LvT1usv65Z%aaOJO0>wo1QG2_3`2A|H0}l^WA3069EJe zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R;YnKqQBFmVT;x>93->vys1;#Ro;c==Wl`C}j{`%et;mJ=iMKS!I$U)uzm~H}2f& zBsbZmbv}=sK9k95TH4CjX*@_{TN$4w?W5WI=&q BX?_3z literal 0 HcmV?d00001 diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..aed943983e5c7f2b909017aa0f8b5ab120dafe87 GIT binary patch literal 17 TcmZR+9$8Xv%;svy00BGzCes4q literal 0 HcmV?d00001 diff --git a/.gradle/5.1.1/fileChanges/last-build.bin b/.gradle/5.1.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..e772f5c3dec51b602621279e9f5bde373e9ebe71 GIT binary patch literal 17 TcmZR6COc7(-*-zY0~7!NC%OY3 literal 0 HcmV?d00001 diff --git a/.gradle/5.1.1/gc.properties b/.gradle/5.1.1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..302e9d2f7b6ee9d13cede25cdc476e53a1be2904 GIT binary patch literal 17 TcmZSnHM^r-M#zAP0Rk8SD@_9l literal 0 HcmV?d00001 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..638c78d3 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Mar 05 15:22:05 IST 2019 +gradle.version=5.1.1 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.gradle/workspace-id.txt b/.gradle/workspace-id.txt new file mode 100644 index 0000000000000000000000000000000000000000..d3eba7ec3f4e314cc16a0f6fe19b72a5d3bc7645 GIT binary patch literal 28 jcmZROGB!%iC`&0xHA+j&O-e5=HO@)NEz8X^%FP7;f`19# literal 0 HcmV?d00001 diff --git a/.gradle/workspace-id.txt.lock b/.gradle/workspace-id.txt.lock new file mode 100644 index 0000000000000000000000000000000000000000..64625a762a43f4df575482d71a503e42e59c339e GIT binary patch literal 17 UcmZQR`L1_aqQ}ca3=qHw0782OLjV8( literal 0 HcmV?d00001 diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index f1b09bc3..f882e7a3 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -33,7 +33,7 @@ - @@ -54,21 +54,21 @@ - - - @@ -100,6 +100,13 @@ + + + + + + @@ -110,7 +117,14 @@ - + + + + + + @@ -142,6 +156,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,10 +198,24 @@ + + + + + + + + + + + + - @@ -173,7 +229,7 @@ - @@ -201,14 +257,14 @@ - - @@ -222,7 +278,7 @@ - @@ -233,6 +289,13 @@ + + + + + + @@ -240,32 +303,41 @@ - + - - - + + + - + + + + + + + - - + + + + - - + + - + + diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml index d77058ba..54c20f1e 100644 --- a/.idea/libraries/Flutter_Plugins.xml +++ b/.idea/libraries/Flutter_Plugins.xml @@ -1,12 +1,12 @@ - - - - - - + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 77727bcd..cb69a478 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,23 +2,8 @@ - - - - - - - - - - - - - - - @@ -35,8 +20,8 @@ - - + + @@ -44,20 +29,11 @@ - - - - - - - - - - - + + @@ -65,8 +41,8 @@ - - + + @@ -94,7 +70,7 @@ - + @@ -103,9 +79,9 @@ - + @@ -144,8 +120,7 @@ - - + @@ -156,8 +131,8 @@ - - + + @@ -179,8 +154,8 @@ - - + + @@ -196,8 +171,8 @@ - - + + @@ -206,8 +181,8 @@ - - + + diff --git a/.vscode/launch.json b/.vscode/launch.json index 70cae3fe..0a3836da 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,12 +7,17 @@ "name": "Flutter", "type": "dart", "request": "launch", + "program": "lib/main.dart" + }, { + "name": "Flutter (verbose)", + "type": "dart", + "request": "launch", "program": "lib/main.dart", "args": [ // "--flavor", // "development" // "-d711KPNY0809287", - // "-v" - ] + "-v" + ], }, ] } diff --git a/android/app/build.gradle b/android/app/build.gradle index 2462edb0..9983b839 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -63,13 +63,14 @@ dependencies { // com.google.common.util.concurrent.ListenableFuture exclude group: 'com.google.guava', module:'guava' } - implementation 'com.google.firebase:firebase-core:16.0.7' - implementation 'com.google.firebase:firebase-firestore:18.0.1' - implementation 'com.google.firebase:firebase-auth:16.1.0' implementation 'androidx.appcompat:appcompat:1.1.0-alpha02' implementation 'androidx.legacy:legacy-support-v4:1.0.0' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } +configurations { + all*.exclude group: 'com.google.guava', module: 'listenablefuture' +} + apply plugin: 'com.google.gms.google-services' diff --git a/android/build.gradle b/android/build.gradle index 64054301..cd30a288 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,8 +5,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0-beta04' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.google.gms:google-services:3.2.1' } } diff --git a/pubspec.lock b/pubspec.lock index e4e928f1..ddc4fabf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -65,7 +65,7 @@ packages: source: hosted version: "0.8.1+4" firebase_core: - dependency: transitive + dependency: "direct main" description: name: firebase_core url: "https://pub.dartlang.org" @@ -171,7 +171,7 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.5.0" petitparser: dependency: transitive description: @@ -225,7 +225,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.4" + version: "1.5.5" stack_trace: dependency: transitive description: @@ -290,5 +290,5 @@ packages: source: hosted version: "3.2.5" sdks: - dart: ">=2.1.0 <3.0.0" + dart: ">=2.1.1-dev.0.0 <3.0.0" flutter: ">=0.7.3 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 977b59d7..47d7092f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,11 +5,13 @@ dependencies: flutter: sdk: flutter + # Firebase/Firestore + firebase_core: ^0.3.1+1 + firebase_auth: ^0.8.1+4 + cloud_firestore: ^0.9.5+2 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 - firebase_auth: ^0.8.0 - cloud_firestore: ^0.9.5+2 google_sign_in: ^4.0.0 flutter_redux: ^0.5.3 shared_preferences: ^0.5.0