Merge branch 'krille/null-safe-dependencies' of gitlab.com:famedly/fluffychat into krille/null-safe-dependencies

.gitlab-ci.yml

@@ -159,7 +159,7 @@ build_linux:
   stage: coverage
   before_script:
     [
-      sudo apt update && sudo apt install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev -y,
+      apt update && apt install git curl unzip clang cmake build-essential ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 -y,
     ]
   script: [./scripts/build-linux.sh]
   artifacts:
@@ -171,7 +171,7 @@ snap:edge:
   stage: release
   image: "snapcore/snapcraft"
   before_script:
-    - apt update && apt install git curl unzip clang cmake build-essential ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1 librhash0 -y
+    - apt update && apt install git curl unzip clang cmake build-essential ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 -y
     - git clone https://github.com/flutter/flutter.git
     - export PATH="$PATH:`pwd`/flutter/bin"
   variables:

android/app/src/main/kotlin/chat/fluffy/fluffychat/Application.kt

@@ -3,8 +3,9 @@ package chat.fluffy.fluffychat
 import io.flutter.app.FlutterApplication
 import io.flutter.plugin.common.PluginRegistry
 import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin
 import io.flutter.view.FlutterMain
-import io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingBackgroundService
+import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
 import com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin
 import com.tekartik.sqflite.SqflitePlugin
 import com.it_nomads.fluttersecurestorage.FlutterSecureStoragePlugin
@@ -14,12 +15,13 @@ class Application : FlutterApplication(), PluginRegistrantCallback {
 
     override fun onCreate() {
         super.onCreate()
-        FlutterFirebaseMessagingBackgroundService.setPluginRegistrant(this);
+        FlutterFirebaseMessagingService.setPluginRegistrant(this);
         FlutterMain.startInitialization(this)
     }
 
     override fun registerWith(registry: PluginRegistry?) {
         if (!registry!!.hasPlugin("io.flutter.plugins.firebasemessaging")) {
+            FirebaseMessagingPlugin.registerWith(registry!!.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
             FlutterLocalNotificationsPlugin.registerWith(registry.registrarFor("com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin"));
             SqflitePlugin.registerWith(registry.registrarFor("com.tekartik.sqflite.SqflitePlugin"));
             PathProviderPlugin.registerWith(registry.registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin"));

lib/utils/background_push.dart

@@ -130,11 +130,12 @@ class BackgroundPush {
     bool useDeviceSpecificAppId = false,
   }) async {
     if (PlatformInfos.isIOS) {
-      await FirebaseMessaging.instance.requestPermission(
+      FirebaseMessaging()
+          .requestNotificationPermissions(IosNotificationSettings(
         sound: true,
         alert: true,
         badge: true,
-      );
+      ));
     }
     final clientName = PlatformInfos.clientName;
     oldTokens ??= <String>{};

pubspec.lock

@@ -215,8 +215,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "ll/null-safety"
+      ref: main
-      resolved-ref: "097a9e0ebb892c2c833b5df231ddedb2865955dd"
+      resolved-ref: "545ce26e3946fc81c728e1435e93cdb9ed3a5e18"
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
@@ -224,8 +224,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "13ace9a4b4553c3c528448391f44d786f5243c57"
+      ref: ios
-      resolved-ref: "13ace9a4b4553c3c528448391f44d786f5243c57"
+      resolved-ref: "86519130e5e122a20fdd31de34013d62a88f106d"
       url: "https://gitlab.com/famedly/libraries/fcm_shared_isolate.git"
     source: git
     version: "0.0.1"
@@ -265,12 +265,12 @@ packages:
     source: hosted
     version: "4.3.2"
   firebase_core:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.2"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -291,21 +291,7 @@ packages:
       name: firebase_messaging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "9.1.1"
+    version: "7.0.3"
-  firebase_messaging_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_messaging_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
-  firebase_messaging_web:
-    dependency: transitive
-    description:
-      name: firebase_messaging_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -633,7 +619,7 @@ packages:
       name: matrix_api_lite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.4"
   matrix_link_text:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   famedlysdk:
     git:
       url: https://gitlab.com/famedly/famedlysdk.git
-      ref: ll/null-safety
+      ref: main
 
   unifiedpush:
     git:
@@ -23,7 +23,7 @@ dependencies:
   fcm_shared_isolate:
     git:
       url: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git
-      ref: 13ace9a4b4553c3c528448391f44d786f5243c57
+      ref: ios
   firebase_messaging: any
   cupertino_icons: any
   localstorage: ^4.0.0+1
@@ -84,6 +84,10 @@ dev_dependencies:
   pedantic: ^1.11.0
   dapackages: ^1.6.0
 
+dependency_overrides:
+  firebase_messaging: 7.0.3
+  firebase_core: 1.0.2
+
 flutter:
   generate: true
   uses-material-design: true