Merge PR #1758

Yubico · Jan 13, 2025 · 7a77892 · 7a77892
2 parents 8d5f721 + 1bca092
commit 7a77892
Show file tree

Hide file tree

Showing 14 changed files with 227 additions and 273 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -91,13 +91,13 @@ dependencies {
     api "com.yubico.yubikit:fido:$project.yubiKitVersion"
     api "com.yubico.yubikit:support:$project.yubiKitVersion"
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0'
 
     // Lifecycle
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
 
-    implementation "androidx.core:core-ktx:1.13.1"
-    implementation 'androidx.fragment:fragment-ktx:1.8.3'
+    implementation "androidx.core:core-ktx:1.15.0"
+    implementation 'androidx.fragment:fragment-ktx:1.8.5'
     implementation 'androidx.preference:preference-ktx:1.2.1'
 
     implementation 'com.google.android.material:material:1.12.0'

diff --git a/android/build.gradle b/android/build.gradle
@@ -11,7 +11,7 @@ allprojects {
 
         yubiKitVersion = "2.7.0"
         junitVersion = "4.13.2"
-        mockitoVersion = "5.13.0"
+        mockitoVersion = "5.15.2"
     }
 }
 

diff --git a/android/flutter_plugins/qrscanner_zxing/android/build.gradle b/android/flutter_plugins/qrscanner_zxing/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.yubico.authenticator.flutter_plugins.qrscanner_zxing'
 version '1.0'
 
 buildscript {
-    ext.kotlin_version = '2.0.20'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.0'
+        classpath 'com.android.tools.build:gradle:8.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -50,11 +50,11 @@ android {
 }
 
 dependencies {
-    def camerax_version = "1.3.4"
+    def camerax_version = "1.4.1"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
     implementation "androidx.camera:camera-view:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
 
-    implementation "com.google.zxing:core:3.5.2"
+    implementation "com.google.zxing:core:3.5.3"
     implementation "com.google.zxing:android-core:3.3.0"
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 15 14:34:17 CEST 2022
+#Fri Jan 10 13:46:25 CET 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -26,9 +26,9 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
-    id "org.jetbrains.kotlin.plugin.serialization" version "2.0.20" apply false
+    id "com.android.application" version "8.8.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+    id "org.jetbrains.kotlin.plugin.serialization" version "2.1.0" apply false
     id "com.google.android.gms.oss-licenses-plugin" version "0.10.6" apply false
 }
 

diff --git a/lib/android/overlay/nfc/nfc_event_notifier.dart b/lib/android/overlay/nfc/nfc_event_notifier.dart
@@ -60,7 +60,7 @@ final nfcEventNotifierListener = Provider<_NfcEventNotifierListener>(
     (ref) => _NfcEventNotifierListener(ref));
 
 class _NfcEventNotifierListener {
-  final ProviderRef _ref;
+  final Ref _ref;
   ProviderSubscription<NfcEvent>? listener;
 
   _NfcEventNotifierListener(this._ref);

diff --git a/lib/android/state.dart b/lib/android/state.dart
@@ -54,7 +54,7 @@ final androidClipboardProvider = Provider<AppClipboard>(
 );
 
 class _AndroidClipboard extends AppClipboard {
-  final ProviderRef<AppClipboard> _ref;
+  final Ref<AppClipboard> _ref;
 
   const _AndroidClipboard(this._ref);
 

diff --git a/lib/android/window_state_provider.dart b/lib/android/window_state_provider.dart
@@ -35,7 +35,7 @@ final androidWindowStateProvider = Provider<WindowState>(
 
 class _WindowStateNotifier extends StateNotifier<WindowState>
     with WidgetsBindingObserver {
-  final StateNotifierProviderRef<_WindowStateNotifier, WindowState> _ref;
+  final Ref<WindowState> _ref;
   _WindowStateNotifier(this._ref)
       : super(WindowState(focused: true, visible: true, active: true)) {
     _init();

diff --git a/lib/app/models.g.dart b/lib/app/models.g.dart
diff --git a/lib/otp/models.g.dart b/lib/otp/models.g.dart
diff --git a/lint/lib/lint.dart b/lint/lib/lint.dart
@@ -52,8 +52,7 @@ class UseRecommendedWidget extends DartLintRule {
   ) {
     context.registry.addInstanceCreationExpression((node) {
       if (node.constructorName.toString() == discouraged) {
-        // ignore: deprecated_member_use
-        reporter.reportErrorForNode(code, node.constructorName);
+        reporter.atNode(node.constructorName, code);
       }
     });
   }
@@ -85,8 +84,7 @@ class CallInitAfterCreation extends DartLintRule {
             return;
           }
         }
-        // ignore: deprecated_member_use
-        reporter.reportErrorForNode(code, node.constructorName);
+        reporter.atNode(node.constructorName, code);
       }
     });
   }

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -58,7 +58,7 @@ SPEC CHECKSUMS:
   screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
-  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
+  url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7