From e8315adb1dedd3a0ab779353e4eafaec89498044 Mon Sep 17 00:00:00 2001 From: vjrj Date: Mon, 25 Jun 2018 19:14:57 +0200 Subject: [PATCH] Added deps after crash --- .gitignore | 6 ++++ README.md | 5 ++++ android/app/build.gradle | 2 +- android/build.gradle | 2 +- assets/private-settings-sample.json | 6 ++++ pubspec.yaml | 46 ++++++++++++++++------------- 6 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 assets/private-settings-sample.json diff --git a/.gitignore b/.gitignore index 1e7ac68..af19b33 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,10 @@ doc/api/ assets/private-settings.json android/app/src/main/AndroidManifest.xml + +.flutter-plugins +android/app/src/main/gen/ + android/app/google-services.json + +assets/private-settings.json diff --git a/README.md b/README.md index ae3f544..62d7418 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,8 @@ All Against Fire For help getting started with Flutter, view our online [documentation](https://flutter.io/). + + +- google-services.json +- Manifest sample +- private keys in assets diff --git a/android/app/build.gradle b/android/app/build.gradle index dd502fb..9d13814 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -48,7 +48,7 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - compile 'com.google.firebase:firebase-core:15.0.2' + implementation 'com.google.firebase:firebase-core:15.0.2' // google recommends 16 but fails because location flutter package deps in 15 } diff --git a/android/build.gradle b/android/build.gradle index 2a0d93d..abea04c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.google.gms:google-services:4.0.0' + classpath 'com.google.gms:google-services:4.0.1' } } diff --git a/assets/private-settings-sample.json b/assets/private-settings-sample.json new file mode 100644 index 0000000..a2e5ffc --- /dev/null +++ b/assets/private-settings-sample.json @@ -0,0 +1,6 @@ +{ + "gmapKey": "", + "firesApiKey": "", + "firesApiUrl": "", + "sentryDSN": "" +} diff --git a/pubspec.yaml b/pubspec.yaml index 4d8e27a..b06158a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,28 +4,39 @@ description: All Against Fire dependencies: flutter: sdk: flutter - intl: "^0.15.6" - # https://pub.dartlang.org/packages/padder - padder: "^1.0.1" # https://pub.dartlang.org/packages/flutter - fluttery: "^0.0.7" + # utils + intl: "^0.15.6" shared_preferences: "^0.4.2" + http: "^0.11.3+16" + simple_moment: "^0.0.3" + just_debounce_it: "^1.0.4" comunes_flutter: path: /home/vjrj/dev/comunes_flutter - version: "^0.0.7" + version: "^0.0.9" + # maps, geo, etc + flutter_map: "^0.0.1" + flutter_google_places_autocomplete: "^0.0.4" + location: "^1.3.4" + geocoder: "^0.0.1" + # layout + fluttery: "^0.0.7" + # https://pub.dartlang.org/packages/padder + padder: "^1.0.1" + flutter_fab_dialer: "^0.0.5" + # firebase + firebase_messaging: "^1.0.2" + # icons # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: "^0.1.2" - location: "^1.3.4" - flutter_google_places_autocomplete: "^0.0.4" + # not using yet get_it: "^1.0.1+1" - flutter_map: "^0.0.1" - http: "^0.11.3+16" - simple_moment: "^0.0.3" - geocoder: "^0.0.1" - just_debounce_it: "^1.0.4" - flutter_fab_dialer: "^0.0.5" - firebase_messaging: "^1.0.2" + # community_material_icon: "^0.1.2" + # url_launcher: "^3.0.2" + # share: "^0.5.2" + # connectivity: "^0.3.1" + # package_info: "^0.3.2" dev_dependencies: flutter_test: @@ -43,14 +54,9 @@ flutter: # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - assets: - - images/logo-200.png - assets/private-settings.json + - images/logo-200.png - images/fire-marker-l.png - images/fire-marker-m.png - images/fire-marker-s.png