Update to Android embedding v2, updated to Gradle 7, upgraded internal dependencies to latest versions

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## 1.4.2+15 - UNRELEASED
 * Minor cleanup
 * Added external drone CI
+* Updated to Android embedding v2
+* Updated to Gradle 7
+* Upgraded internal dependencies to latest versions
 
 ## 1.4.1+14
 * Fixed opening links

README.md

@@ -32,8 +32,8 @@ Start by installing dependencies and generating entities!
 ### Working versions for SDK
 
 ```
-Flutter version 2.8.1
+Flutter version 2.10.5
-Dart version 2.15.1
+Dart version 2.16.2
 ```
 
 ## Dependencies

android/app/build.gradle

@@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     lintOptions {
         disable 'InvalidPackage'
@@ -40,7 +40,7 @@ android {
     defaultConfig {
         applicationId "de.varakh.fbmobile"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/app/src/main/AndroidManifest.xml

@@ -6,11 +6,12 @@
          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="FileBin"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

android/app/src/main/java/de/varakh/fbmobile/MainActivity.java

@@ -1,14 +1,6 @@
 package de.varakh.fbmobile;
 
-import androidx.annotation.NonNull;
-
 import io.flutter.embedding.android.FlutterActivity;
-import io.flutter.embedding.engine.FlutterEngine;
-import io.flutter.plugins.GeneratedPluginRegistrant;
 
 public class MainActivity extends FlutterActivity {
-    @Override
-    public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
-    }
 }

android/build.gradle

@@ -5,9 +5,7 @@ buildscript {
     }
 
     dependencies {
-        // TODO switch to 4.0.1 again: https://github.com/flutter/flutter/issues/58479
+        classpath 'com.android.tools.build:gradle:7.0.4'
-        // TODO switch to 4.0.1 again: https://github.com/miguelpruivo/flutter_file_picker/issues/545
-        classpath 'com.android.tools.build:gradle:3.6.2'
     }
 }
 

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.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

lib/core/services/link_service.dart

@@ -11,14 +11,15 @@ class LinkService {
   final DialogService _dialogService = locator<DialogService>();
 
   Future open(String link) async {
-    if (await canLaunch(link)) {
+    Uri uri = Uri.parse(link);
-      await launch(link);
+
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
     } else {
       _logger.e('Could not launch link $link');
       _dialogService.showDialog(
           title: translate('link.dialog.title'),
-          description:
+          description: translate('link.dialog.description', args: {'link': link}));
-              translate('link.dialog.description', args: {'link': link}));
     }
   }
 }

pubspec.lock

@@ -56,7 +56,7 @@ packages:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   build_resolvers:
     dependency: transitive
     description:
@@ -70,7 +70,7 @@ packages:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.10"
   build_runner_core:
     dependency: transitive
     description:
@@ -217,7 +217,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2"
+    version: "4.5.1"
   fixnum:
     dependency: transitive
     description:
@@ -342,14 +342,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.4.0"
+    version: "4.5.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.4"
+    version: "6.2.0"
   linkify:
     dependency: transitive
     description:
@@ -378,6 +378,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     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:
@@ -412,14 +419,14 @@ packages:
       name: package_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.2"
   package_info_plus_linux:
     dependency: transitive
     description:
       name: package_info_plus_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.5"
   package_info_plus_macos:
     dependency: transitive
     description:
@@ -440,14 +447,14 @@ packages:
       name: package_info_plus_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   package_info_plus_windows:
     dependency: transitive
     description:
       name: package_info_plus_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   path:
     dependency: transitive
     description:
@@ -482,7 +489,21 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.3.0"
+    version: "9.2.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.0.2+1"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.0.4"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -490,6 +511,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.7.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0"
   platform:
     dependency: transitive
     description:
@@ -559,49 +587,49 @@ packages:
       name: share_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "4.0.4"
   share_plus_linux:
     dependency: transitive
     description:
       name: share_plus_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "3.0.0"
   share_plus_macos:
     dependency: transitive
     description:
       name: share_plus_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "3.0.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.2"
   share_plus_web:
     dependency: transitive
     description:
       name: share_plus_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "3.0.0"
   share_plus_windows:
     dependency: transitive
     description:
       name: share_plus_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -711,7 +739,7 @@ packages:
       name: stacked
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.8"
+    version: "2.3.3"
   stream_channel:
     dependency: transitive
     description:
@@ -746,7 +774,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   timing:
     dependency: transitive
     description:
@@ -774,7 +802,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.18"
+    version: "6.1.0"
   url_launcher_android:
     dependency: transitive
     description:
@@ -858,7 +886,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.8"
+    version: "2.5.2"
   xdg_directories:
     dependency: transitive
     description:
@@ -874,5 +902,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.15.1 <3.0.0"
+  dart: ">=2.16.2 <3.0.0"
-  flutter: ">=2.5.0"
+  flutter: ">=2.8.0"

pubspec.yaml

@@ -14,7 +14,7 @@ description: A mobile client for FileBin.
 version: 1.4.2+15
 
 environment:
-    sdk: '>=2.15.1 <3.0.0'
+    sdk: '>=2.16.2 <3.0.0'
 
 dependencies:
     flutter:
@@ -24,30 +24,30 @@ dependencies:
         sdk: flutter
     flutter_translate: 3.0.1
     provider: 6.0.2
-    stacked: 2.2.8
+    stacked: 2.3.3
     get_it: 7.2.0
     logger: 1.1.0
-    shared_preferences: 2.0.12
+    shared_preferences: 2.0.13
     http: 0.13.4
     validators: 3.0.0
     flutter_linkify: 5.0.2
-    url_launcher: 6.0.18
+    url_launcher: 6.1.0
     expandable: 5.0.1
-    share_plus: 3.0.4
+    share_plus: 4.0.4
-    file_picker: 4.3.2
+    file_picker: 4.5.1
     clipboard: 0.1.3
     receive_sharing_intent: 1.4.5
-    permission_handler: 8.3.0
+    permission_handler: 9.2.0
-    package_info_plus: 1.3.0
+    package_info_plus: 1.4.2
     simple_gesture_detector: 0.2.0
-    json_annotation: 4.4.0
+    json_annotation: 4.5.0
 
 dev_dependencies:
     flutter_test:
         sdk: flutter
-    build_runner: 2.1.7
+    build_runner: 2.1.10
     built_value_generator: 8.1.4
-    json_serializable: 6.1.4
+    json_serializable: 6.2.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec