Upgrade dependencies, including Flutter 3.22

Support Kotlin 1.9 plugins
kee-org · Aug 8, 2024 · 7169790 · 7169790
1 parent 690cb6d
commit 7169790
Show file tree

Hide file tree

Showing 19 changed files with 369 additions and 335 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,3 @@
 {
-  "flutterSdkVersion": "3.16.5",
-  "flavors": {}
+  "flutterSdkVersion": "3.22.2"
 }
diff --git a/.fvmrc b/.fvmrc
@@ -0,0 +1,4 @@
+{
+  "flutter": "3.22.2",
+  "flavors": {}
+}
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,6 @@
 .pub/
 /build/
 .gradle/
-.fvm/flutter_sdk
 integration_test/test_bundle.dart
 
 # Web related
@@ -57,3 +56,6 @@ ios/Flutter/KeeVault-generated.xcconfig
 ios/fastlane/report.xml
 ios/Runner.app.dSYM.zip
 ios/Runner.ipa
+
+# FVM Version Cache
+.fvm/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,69 +1,67 @@
 {
-    "dart.lineLength": 120,
-    "[dart]": {
-        "editor.rulers": [
-            80,
-            120
-        ],
-    },
-    "cSpell.words": [
-        "analyzer",
-        "analyzes",
-        "applocker",
-        "Autofilling",
-        "Autovalidate",
-        "Behavior",
-        "bloclistener",
-        "color",
-        "Colors",
-        "Compat",
-        "creds",
-        "Derivator",
-        "derivators",
-        "Dialog",
-        "FFTpassword",
-        "FFTtext",
-        "FFTusername",
-        "fluro",
-        "fromLTRB",
-        "kdbxstring",
-        "keepass",
-        "keevault",
-        "keevaultpendingautofillassociations",
-        "keyfile",
-        "keyvalue",
-        "oneplus",
-        "otpauth",
-        "Parcelable",
-        "pointycastle",
-        "quickunlock",
-        "Rect",
-        "reemit",
-        "reenter",
-        "Signup",
-        "sipi",
-        "textfield",
-        "treeview",
-        "unfocus",
-        "Unlocker",
-        "unprotect",
-        "yMMMMEEEEd",
-        "zxcvbn"
-    ],
-    "cSpell.ignorePaths": [
-        "**/generated/**",
-        "phonetic.dart",
-        ".git",                // Ignore the .git directory
-        "*.dll",               // Ignore all .dll files.
-        "**/*.dll"             // Ignore all .dll files
-    ],
-    "dart.flutterSdkPath": ".fvm/flutter_sdk",
-    // Remove .fvm files from search
-    "search.exclude": {
-        "**/.fvm": true
-    },
-    // Remove from file watching
-    "files.watcherExclude": {
-        "**/.fvm": true
-    }
+  "dart.lineLength": 120,
+  "[dart]": {
+    "editor.rulers": [
+      80,
+      120
+    ]
+  },
+  "cSpell.words": [
+    "analyzer",
+    "analyzes",
+    "applocker",
+    "Autofilling",
+    "Autovalidate",
+    "Behavior",
+    "bloclistener",
+    "color",
+    "Colors",
+    "Compat",
+    "creds",
+    "Derivator",
+    "derivators",
+    "Dialog",
+    "FFTpassword",
+    "FFTtext",
+    "FFTusername",
+    "fluro",
+    "fromLTRB",
+    "kdbxstring",
+    "keepass",
+    "keevault",
+    "keevaultpendingautofillassociations",
+    "keyfile",
+    "keyvalue",
+    "oneplus",
+    "otpauth",
+    "Parcelable",
+    "pointycastle",
+    "quickunlock",
+    "Rect",
+    "reemit",
+    "reenter",
+    "Signup",
+    "sipi",
+    "textfield",
+    "treeview",
+    "unfocus",
+    "Unlocker",
+    "unprotect",
+    "yMMMMEEEEd",
+    "zxcvbn"
+  ],
+  "cSpell.ignorePaths": [
+    "**/generated/**",
+    "phonetic.dart",
+    ".git",
+    "*.dll",
+    "**/*.dll"
+  ],
+  "dart.flutterSdkPath": ".fvm/versions/3.22.2",
+  "search.exclude": {
+    "**/.fvm": true
+  },
+  "files.watcherExclude": {
+    "**/.fvm": true
+  }
 }
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "com.android.application"
-    id "kotlin-android"
+    id 'org.jetbrains.kotlin.android' version '1.9.25'
     id "dev.flutter.flutter-gradle-plugin"
 }
 
@@ -115,7 +115,7 @@ android {
         applicationId "com.keevault.keevault"
         applicationIdSuffix idSuffix
         minSdkVersion 29
-        targetSdk 33
+        targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         resValue "string", "app_name", "Kee Vault" + nameSuffix
@@ -145,17 +145,16 @@ android {
     }
     namespace 'com.keevault.keevault'
 
-    ndkVersion "23.1.7779620"
+    ndkVersion "26.1.10909125"
 }
 
 flutter {
     source '../..'
 }
 
 dependencies {
-    //implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'org.tinylog:tinylog-api:2.6.2'
     implementation 'org.tinylog:tinylog-impl:2.6.2'
     implementation 'org.tinylog:slf4j-tinylog:2.6.2'
-    androidTestUtil "androidx.test:orchestrator:1.4.2"
-}
+    androidTestUtil "androidx.test:orchestrator:1.5.0"
+}
diff --git a/android/app/src/androidTest/java/com/keevault/keevault/MainActivityTest.java b/android/app/src/androidTest/java/com/keevault/keevault/MainActivityTest.java
@@ -1,31 +1,31 @@
-package com.keevault.keevault;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import pl.leancode.patrol.PatrolJUnitRunner;
-
-@RunWith(Parameterized.class)
-public class MainActivityTest {
-    @Parameters(name = "{0}")
-    public static Object[] testCases() {
-        PatrolJUnitRunner instrumentation = (PatrolJUnitRunner) InstrumentationRegistry.getInstrumentation();
-        instrumentation.setUp(MainActivity.class);
-        instrumentation.waitForPatrolAppService();
-        return instrumentation.listDartTests();
-    }
-
-    public MainActivityTest(String dartTestName) {
-        this.dartTestName = dartTestName;
-    }
-
-    private final String dartTestName;
-
-    @Test
-    public void runDartTest() {
-        PatrolJUnitRunner instrumentation = (PatrolJUnitRunner) InstrumentationRegistry.getInstrumentation();
-        instrumentation.runDartTest(dartTestName);
-    }
-}
+//package com.keevault.keevault;
+//
+//import androidx.test.platform.app.InstrumentationRegistry;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.junit.runners.Parameterized;
+//import org.junit.runners.Parameterized.Parameters;
+//import pl.leancode.patrol.PatrolJUnitRunner;
+//
+//@RunWith(Parameterized.class)
+//public class MainActivityTest {
+//    @Parameters(name = "{0}")
+//    public static Object[] testCases() {
+//        PatrolJUnitRunner instrumentation = (PatrolJUnitRunner) InstrumentationRegistry.getInstrumentation();
+//        instrumentation.setUp(MainActivity.class);
+//        instrumentation.waitForPatrolAppService();
+//        return instrumentation.listDartTests();
+//    }
+//
+//    public MainActivityTest(String dartTestName) {
+//        this.dartTestName = dartTestName;
+//    }
+//
+//    private final String dartTestName;
+//
+//    @Test
+//    public void runDartTest() {
+//        PatrolJUnitRunner instrumentation = (PatrolJUnitRunner) InstrumentationRegistry.getInstrumentation();
+//        instrumentation.runDartTest(dartTestName);
+//    }
+//}
diff --git 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-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.3" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version '8.5.1' apply false
+    id "org.jetbrains.kotlin.android" version "1.9.25" apply false
 }
 
 include ":app"
diff --git a/lib/widgets/account_create.dart b/lib/widgets/account_create.dart
@@ -712,7 +712,7 @@ class _AccountCreateWidgetState extends State<AccountCreateWidget> {
       try {
         blockingOverlay.hide();
       } on Exception {
-        if (context.mounted) {
+        if (mounted) {
           BlockingOverlay.of(context).hide();
         }
       }
@@ -735,7 +735,7 @@ class _AccountCreateWidgetState extends State<AccountCreateWidget> {
       try {
         blockingOverlay.hide();
       } on Exception {
-        if (context.mounted) {
+        if (mounted) {
           BlockingOverlay.of(context).hide();
         }
       }

diff --git a/lib/widgets/bottom.dart b/lib/widgets/bottom.dart
@@ -123,7 +123,7 @@ class AccountDrawerWidget extends StatelessWidget {
               (EnvironmentConfig.iapAppleAppStore && KeeVaultPlatform.isIOS);
           final theme = Theme.of(context);
           final headerColor =
-              theme.brightness == Brightness.light ? theme.colorScheme.primary : theme.colorScheme.onBackground;
+              theme.brightness == Brightness.light ? theme.colorScheme.primary : theme.colorScheme.onSurface;
           final accountActionSection = (user?.email != null)
               ? ExpansionTile(
                   initiallyExpanded: state is! VaultLoaded,

diff --git a/lib/widgets/coloured_safe_area_widget.dart b/lib/widgets/coloured_safe_area_widget.dart
@@ -16,7 +16,7 @@ class ColouredSafeArea extends StatelessWidget {
       color: colour ?? Theme.of(context).appBarTheme.backgroundColor,
       child: SafeArea(
         child: Container(
-          color: Theme.of(context).colorScheme.background,
+          color: Theme.of(context).colorScheme.surface,
           child: child,
         ),
       ),