обновление пакетов

iska9der · Sep 17, 2024 · ac2b99a · ac2b99a
1 parent 4379f3e
commit ac2b99a
Show file tree

Hide file tree

Showing 14 changed files with 481 additions and 522 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,7 +4,14 @@
     {
       "type": "flutter",
       "command": "flutter",
-      "args": ["build", "apk", "--release", "--split-per-abi"],
+      "args": [
+        "build",
+        "apk",
+        "--release",
+        "--split-per-abi",
+        "--dart-define-from-file",
+        "env/variables.json"
+      ],
       "group": "build",
       "problemMatcher": [],
       "label": "flutter: build release apk [split]",
@@ -20,10 +27,12 @@
         "build",
         "--delete-conflicting-outputs"
       ],
-      "problemMatcher": ["$dart-build_runner"],
+      "problemMatcher": [
+        "$dart-build_runner"
+      ],
       "group": "build",
       "label": "build_runner build",
       "detail": ""
     }
   ]
-}
+}
diff --git a/android/.gitignore b/android/.gitignore
@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
-**/*.jks
+**/*.jks
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -25,13 +25,13 @@ def flutterVersionCode = localProperties.getProperty('flutter.versionCode') ?: '
 def flutterVersionName = localProperties.getProperty('flutter.versionName') ?: '1.0'
 
 android {
-    compileSdkVersion 34
-    namespace "ru.iska9der.flabr"
-    ndkVersion flutter.ndkVersion
+    namespace = "ru.iska9der.flabr"
+    compileSdk = 34
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
@@ -43,30 +43,30 @@ android {
     }
 
     defaultConfig {
-        applicationId "ru.iska9der.flabr"
-        minSdkVersion 21
-        targetSdkVersion 34
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-        multiDexEnabled true
+        applicationId = "ru.iska9der.flabr"
+        minSdk = 21
+        targetSdk = 34
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
+        multiDexEnabled = true
     }
 
    signingConfigs {
        release {
-           keyAlias keystoreProperties['keyAlias']
-           keyPassword keystoreProperties['keyPassword']
-           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-           storePassword keystoreProperties['storePassword']
+           keyAlias = keystoreProperties['keyAlias']
+           keyPassword = keystoreProperties['keyPassword']
+           storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword = keystoreProperties['storePassword']
        }
    }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig = signingConfigs.release
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = '../..'
 }
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -0,0 +1,7 @@
+# https://github.com/mogol/flutter_secure_storage/issues/748
+-dontwarn com.google.errorprone.annotations.CanIgnoreReturnValue
+-dontwarn com.google.errorprone.annotations.CheckReturnValue
+-dontwarn com.google.errorprone.annotations.Immutable
+-dontwarn com.google.errorprone.annotations.RestrictedApi
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.concurrent.GuardedBy
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,12 +5,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -18,9 +18,9 @@ pluginManagement {
 }
 
 plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.2"
-    id "com.android.application" version "7.1.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.22" apply false
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"
diff --git a/lib/core/component/di/injector.config.dart b/lib/core/component/di/injector.config.dart
diff --git a/lib/core/component/router/app_router.dart b/lib/core/component/router/app_router.dart
@@ -46,7 +46,7 @@ part 'app_router.gr.dart';
   replaceInRouteName: 'Page,Route',
 )
 // extend the generated private router
-class AppRouter extends _$AppRouter {
+class AppRouter extends RootStackRouter {
   /// Открыть внешнюю ссылку
   Future launchUrl(String url) => launchUrlString(
         url,