diff --git a/android/app/build.gradle b/android/app/build.gradle index 21ce8ff..293ad3a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -22,7 +22,6 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' -apply plugin: 'com.google.gms.google-services' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" @@ -66,7 +65,5 @@ flutter { } dependencies { - implementation platform('com.google.firebase:firebase-bom:29.0.4') - implementation 'com.google.firebase:firebase-analytics' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/android/app/google-services.json b/android/app/google-services.json deleted file mode 100644 index 5cb370e..0000000 --- a/android/app/google-services.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "project_info": { - "project_number": "935017686266", - "project_id": "didvan-9b7da", - "storage_bucket": "didvan-9b7da.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:935017686266:android:f9cbc9aba8e3d65ed2d543", - "android_client_info": { - "package_name": "com.didvan.didvanapp" - } - }, - "oauth_client": [ - { - "client_id": "935017686266-lebnol7rb05oi9h0mripb41c892d2gij.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBp-UHjWeM0H0UHtX5yguFKG-riMzvvCzw" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "935017686266-lebnol7rb05oi9h0mripb41c892d2gij.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 1607692..09fbd64 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,11 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.google.gms:google-services:4.3.10' classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..562c5e4 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/lib/services/app_initalizer.dart b/lib/services/app_initalizer.dart index 2e9b1aa..74c1e6c 100644 --- a/lib/services/app_initalizer.dart +++ b/lib/services/app_initalizer.dart @@ -1,6 +1,4 @@ import 'package:didvan/services/storage/storage.dart'; -import 'package:firebase_core/firebase_core.dart'; -import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:path_provider/path_provider.dart'; @@ -12,7 +10,6 @@ class AppInitializer { (await getApplicationDocumentsDirectory()).path; StorageService.appTempsDir = (await getTemporaryDirectory()).path; } - await _initializeFirebase(); } static Future initilizeSettings() async { @@ -43,29 +40,4 @@ class AppInitializer { return ThemeMode.light; } } - - static Future _initializeFirebase() async { - try { - await Firebase.initializeApp( - options: const FirebaseOptions( - apiKey: 'AIzaSyBp-UHjWeM0H0UHtX5yguFKG-riMzvvCzw', - appId: '1:935017686266:android:f9cbc9aba8e3d65ed2d543', - messagingSenderId: '935017686266', - projectId: 'didvan-9b7da', - ), - ); - } catch (e) { - Firebase.app(); - } - final FirebaseMessaging fcm = FirebaseMessaging.instance; - await fcm.requestPermission( - alert: true, - announcement: false, - badge: true, - carPlay: false, - criticalAlert: false, - provisional: false, - sound: true, - ); - } } diff --git a/pubspec.lock b/pubspec.lock index fce966d..c9f9dab 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -155,48 +155,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "6.1.2" - firebase_core: - dependency: "direct main" - description: - name: firebase_core - url: "https://pub.dartlang.org" - source: hosted - version: "1.12.0" - firebase_core_platform_interface: - dependency: transitive - description: - name: firebase_core_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.4" - firebase_core_web: - dependency: transitive - description: - name: firebase_core_web - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.4" - firebase_messaging: - dependency: "direct main" - description: - name: firebase_messaging - url: "https://pub.dartlang.org" - source: hosted - version: "11.2.6" - firebase_messaging_platform_interface: - dependency: transitive - description: - name: firebase_messaging_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.6" - firebase_messaging_web: - dependency: transitive - description: - name: firebase_messaging_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.7" flutter: dependency: "direct main" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 7edbbbb..1b01072 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,8 +60,6 @@ dependencies: flutter_html: ^3.0.0-alpha.2 crop: ^0.5.2 url_launcher: ^6.0.18 - firebase_messaging: ^11.2.6 - firebase_core: ^1.12.0 dev_dependencies: