Merge pull request #4 from levin-riegner/dependencies-upgrade

Upgrade Flutter, dependencies and clean deprecated code
levin-riegner · Mar 4, 2022 · b767856 · b767856
2 parents 656982a + 8d60e14
commit b767856
Show file tree

Hide file tree

Showing 10 changed files with 172 additions and 89 deletions.
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="example"
         android:icon="@mipmap/ic_launcher">
         <activity

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:lr_app_versioning/app_versioning.dart';
 

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,14 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -84,35 +84,42 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.13.1"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "4.2.5"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.6.1"
   firebase_remote_config:
     dependency: transitive
     description:
       name: firebase_remote_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.0+1"
+    version: "2.0.2"
   firebase_remote_config_platform_interface:
     dependency: transitive
     description:
       name: firebase_remote_config_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0+1"
+    version: "1.1.1"
+  firebase_remote_config_web:
+    dependency: transitive
+    description:
+      name: firebase_remote_config_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.7"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -148,7 +155,7 @@ packages:
       name: in_app_update
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   js:
     dependency: transitive
     description:
@@ -178,14 +185,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   package_info:
     dependency: transitive
     description:
@@ -351,7 +365,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -386,7 +400,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -449,7 +463,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   version:
     dependency: transitive
     description:
@@ -479,5 +493,5 @@ packages:
     source: hosted
     version: "5.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.16.0 <3.0.0"
   flutter: ">=1.22.0"
diff --git a/lib/src/api/service/default_api_versioning_service.dart b/lib/src/api/service/default_api_versioning_service.dart
@@ -1,10 +1,7 @@
 import 'dart:convert';
 
 import 'package:lr_app_versioning/app_versioning.dart';
-import 'package:lr_app_versioning/src/api/config/api_config.dart';
 import 'package:lr_app_versioning/src/api/model/api_versioning.dart';
-import 'package:lr_app_versioning/src/model/minimum_versions.dart';
-import 'package:lr_app_versioning/src/service/minimum_versioning_service.dart';
 import 'package:lr_core/lr_core.dart';
 
 class DefaultApiVersioningService extends MinimumVersioningService {

diff --git a/lib/src/default_app_versioning.dart b/lib/src/default_app_versioning.dart
@@ -1,11 +1,7 @@
 import 'dart:io';
 
 import 'package:lr_app_versioning/app_versioning.dart';
-import 'package:lr_app_versioning/src/model/app_update_info.dart';
-import 'package:lr_app_versioning/src/service/device_versioning_service.dart';
-import 'package:lr_app_versioning/src/service/minimum_versioning_service.dart';
 import 'package:lr_app_versioning/src/service/optional_update_service.dart';
-import 'package:lr_app_versioning/src/util/version.dart';
 import 'package:lr_app_versioning/src/util/version_tracker.dart';
 
 class DefaultAppVersioning implements AppVersioning {

diff --git a/lib/src/device/service/default_device_versioning_service.dart b/lib/src/device/service/default_device_versioning_service.dart
@@ -2,9 +2,6 @@ import 'dart:io';
 
 import 'package:in_app_update/in_app_update.dart' as iau;
 import 'package:lr_app_versioning/app_versioning.dart';
-import 'package:lr_app_versioning/src/device/config/update_config.dart';
-import 'package:lr_app_versioning/src/service/device_versioning_service.dart';
-import 'package:lr_app_versioning/src/util/version.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 

diff --git a/lib/src/firebase/service/default_firebase_versioning_service.dart b/lib/src/firebase/service/default_firebase_versioning_service.dart
@@ -1,9 +1,6 @@
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:firebase_remote_config/firebase_remote_config.dart';
 import 'package:lr_app_versioning/app_versioning.dart';
-import 'package:lr_app_versioning/src/firebase/config/remote_config_keys.dart';
-import 'package:lr_app_versioning/src/model/minimum_versions.dart';
-import 'package:lr_app_versioning/src/service/minimum_versioning_service.dart';
 
 class DefaultFirebaseVersioningService extends MinimumVersioningService {
   final RemoteConfigKeys remoteConfigKeys;
@@ -13,7 +10,7 @@ class DefaultFirebaseVersioningService extends MinimumVersioningService {
   /// Get api versioning. Throws [FailedToGetMinimumVersioning].
   @override
   Future<MinimumVersions> getMinimumVersions() async {
-    final RemoteConfig remoteConfig = RemoteConfig.instance;
+    final FirebaseRemoteConfig remoteConfig = FirebaseRemoteConfig.instance;
     // Fetch and Activate configs
     try {
       await remoteConfig.fetchAndActivate();