From 16f68a6be5438fb069423958a7bef9e823fad3c4 Mon Sep 17 00:00:00 2001 From: himanshu goyal Date: Tue, 4 Feb 2025 12:36:47 +0530 Subject: [PATCH 1/5] add firbase configuration and google signin --- android/app/build.gradle | 3 +++ android/build.gradle | 3 +++ 2 files changed, 6 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index e1d57237..3798d4a6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -21,6 +21,9 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +// START: FlutterFire Configuration +apply plugin: 'com.google.gms.google-services' +// END: FlutterFire Configuration apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply from: project(':flutter_config').projectDir.getPath() + "/dotenv.gradle" diff --git a/android/build.gradle b/android/build.gradle index 9b6b7376..721cab2c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,6 +6,9 @@ buildscript { } dependencies { + // START: FlutterFire Configuration + classpath 'com.google.gms:google-services:4.3.15' + // END: FlutterFire Configuration classpath 'com.android.tools.build:gradle:7.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } From 258f144dc6b25c793f20feaaed7e51e581ac1884 Mon Sep 17 00:00:00 2001 From: himanshu goyal Date: Tue, 4 Feb 2025 12:42:26 +0530 Subject: [PATCH 2/5] add updated pubspec --- .gitignore | 5 ++++ lib/main.dart | 6 ++++ pubspec.lock | 77 ++++++++++++++++++++++++++++++++++----------------- pubspec.yaml | 31 +++++++++++---------- 4 files changed, 78 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 45ed5324..22cac51d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,11 @@ .history .svn/ *.env +.vscode +/lib/firebase_options.dart +/android/app/google-services.json +/firebase.json + # IntelliJ related *.iml diff --git a/lib/main.dart b/lib/main.dart index a9f94439..869b6539 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -13,9 +13,15 @@ import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:overlay_support/overlay_support.dart'; import 'package:responsive_sizer/responsive_sizer.dart'; +import 'package:firebase_core/firebase_core.dart'; +import 'firebase_options.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); + // loading variables await EnvironmentConfig.loadEnvVariables(); diff --git a/pubspec.lock b/pubspec.lock index 5d38c564..5bab2996 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" connectivity_plus: dependency: "direct main" description: @@ -321,6 +321,30 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0" + firebase_core: + dependency: "direct main" + description: + name: firebase_core + sha256: "06537da27db981947fa535bb91ca120b4e9cb59cb87278dbdde718558cafc9ff" + url: "https://pub.dev" + source: hosted + version: "3.4.0" + firebase_core_platform_interface: + dependency: transitive + description: + name: firebase_core_platform_interface + sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf + url: "https://pub.dev" + source: hosted + version: "5.4.0" + firebase_core_web: + dependency: transitive + description: + name: firebase_core_web + sha256: "362e52457ed2b7b180964769c1e04d1e0ea0259fdf7025fdfedd019d4ae2bd88" + url: "https://pub.dev" + source: hosted + version: "2.17.5" fixnum: dependency: transitive description: @@ -433,11 +457,12 @@ packages: flutter_slidable: dependency: "direct main" description: - name: flutter_slidable - sha256: "2c5611c0b44e20d180e4342318e1bbc28b0a44ad2c442f5df16962606fd3e8e3" - url: "https://pub.dev" - source: hosted - version: "3.1.1" + path: "." + ref: master + resolved-ref: a510f1e94d766bc240ea264a350d18a5e60cf0d0 + url: "https://github.com/letsar/flutter_slidable.git" + source: git + version: "4.0.0" flutter_spinkit: dependency: "direct main" description: @@ -836,18 +861,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -1252,7 +1277,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" sliding_up_panel: dependency: "direct main" description: @@ -1305,10 +1330,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -1329,10 +1354,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -1345,26 +1370,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" url: "https://pub.dev" source: hosted - version: "1.25.7" + version: "1.25.8" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" test_core: dependency: transitive description: name: test_core - sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" timezone: dependency: transitive description: @@ -1489,10 +1514,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" watcher: dependency: transitive description: @@ -1566,5 +1591,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2cb7af06..b8389fca 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: '>=3.3.0 <4.0.0' + sdk: ">=3.3.0 <4.0.0" dependencies: connectivity_plus: any @@ -23,19 +23,19 @@ dependencies: flutter_spinkit: ^5.2.0 fluttertoast: ^8.2.4 geolocator: any - get_it: ^7.6.4 + get_it: ^7.6.4 google_maps_flutter: ^2.5.3 hive: ^2.2.3 intl: ^0.17.0 location: ^7.0.0 - mockito: - modal_progress_hud_nsn: ^0.5.1 - overlay_support: ^2.1.0 - path_provider: ^2.0.4 + mockito: + modal_progress_hud_nsn: ^0.5.1 + overlay_support: ^2.1.0 + path_provider: ^2.0.4 provider: ^6.1.1 rxdart: ^0.27.7 share_plus: ^9.0.0 - shared_preferences: ^2.0.7 + shared_preferences: ^2.0.7 responsive_sizer: ^3.3.1 skeleton_text: ^3.0.1 sliding_up_panel: ^2.0.0+1 @@ -56,24 +56,25 @@ dependencies: freezed_annotation: ^2.4.1 # for dismissable widget - flutter_slidable: ^3.1.0 + flutter_slidable: + git: + url: https://github.com/letsar/flutter_slidable.git + ref: master graphql_flutter: ^5.1.2 http: ^0.13.6 pinput: ^5.0.0 vibration: ^1.9.0 + firebase_core: google_sign_in: ^6.2.1 - - - dev_dependencies: - build_runner: ^2.1.2 - flutter_launcher_icons: ^0.13.1 + build_runner: ^2.1.2 + flutter_launcher_icons: ^0.13.1 flutter_test: sdk: flutter freezed: ^2.5.2 - test: ^1.16.5 - hive_generator: + test: ^1.16.5 + hive_generator: json_annotation: ^4.9.0 json_serializable: ^6.8.0 From 03c078deb3d96e26b77cd30d40b18d3ecb0e0ee8 Mon Sep 17 00:00:00 2001 From: himanshu goyal Date: Sat, 8 Feb 2025 12:47:25 +0530 Subject: [PATCH 3/5] upgrade flutter verion in workflow --- .github/workflows/flutter-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 5c94e182..8f17a3e5 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -20,7 +20,7 @@ jobs: - uses: subosito/flutter-action@v2 with: # Temporary fix to failing CI - flutter-version: '3.22.2' + flutter-version: '3.27.3' architecture: x64 # channel: "stable" - run: flutter pub get From 2a158c172a349b85912b9faaae6cd8ffbb15f455 Mon Sep 17 00:00:00 2001 From: himanshu goyal Date: Sat, 8 Feb 2025 12:50:17 +0530 Subject: [PATCH 4/5] upgrade flutter verion 3.27.4 --- .github/workflows/flutter-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 8f17a3e5..c8304f4d 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -20,7 +20,7 @@ jobs: - uses: subosito/flutter-action@v2 with: # Temporary fix to failing CI - flutter-version: '3.27.3' + flutter-version: '3.27.4' architecture: x64 # channel: "stable" - run: flutter pub get From c2d1ea1d3f8e077e8fd6e8e1ad0a67e9e19f7354 Mon Sep 17 00:00:00 2001 From: himanshu goyal Date: Sat, 8 Feb 2025 13:08:08 +0530 Subject: [PATCH 5/5] upgrade flutter verion 3.27.4 --- .github/workflows/flutter-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index c8304f4d..b3d2b925 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -19,10 +19,8 @@ jobs: java-version: "12.x" - uses: subosito/flutter-action@v2 with: - # Temporary fix to failing CI - flutter-version: '3.27.4' + flutter-version: "3.27.4" # Ensuring latest Dart version architecture: x64 - # channel: "stable" - run: flutter pub get - run: dart format . --set-exit-if-changed - run: flutter analyze . @@ -39,10 +37,8 @@ jobs: java-version: "12.x" - uses: subosito/flutter-action@v2 with: - # Temporary fix to failing CI - flutter-version: '3.22.2' + flutter-version: "3.27.4" # Updated to match test job architecture: x64 - # channel: "stable" - run: flutter pub get - run: dart format . --set-exit-if-changed - run: flutter analyze .