Merge branch 'main' into fix/android-nfc

android/app/src/main/java/com/yubico/authenticator/api/Pigeon.java

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v3.1.6), do not edit directly.
+// Autogenerated from Pigeon (v3.2.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.yubico.authenticator.api;

lib/android/api/impl.dart

@@ -1,7 +1,6 @@
-// Autogenerated from Pigeon (v3.1.6), do not edit directly.
+// Autogenerated from Pigeon (v3.2.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
-// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name
-// @dart = 2.12
+// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 import 'dart:async';
 import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List;
 

lib/desktop/models.freezed.dart

@@ -262,7 +262,9 @@ class _$Success implements Success {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$SuccessToJson(this);
+    return _$$SuccessToJson(
+      this,
+    );
   }
 }
 
@@ -436,7 +438,9 @@ class _$Signal implements Signal {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$SignalToJson(this);
+    return _$$SignalToJson(
+      this,
+    );
   }
 }
 
@@ -623,7 +627,9 @@ class _$RpcError implements RpcError {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$RpcErrorToJson(this);
+    return _$$RpcErrorToJson(
+      this,
+    );
   }
 }
 
@@ -769,7 +775,9 @@ class _$_RpcState implements _RpcState {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_RpcStateToJson(this);
+    return _$$_RpcStateToJson(
+      this,
+    );
   }
 }
 

lib/fido/models.freezed.dart

@@ -148,7 +148,9 @@ class _$_FidoState extends _FidoState {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_FidoStateToJson(this);
+    return _$$_FidoStateToJson(
+      this,
+    );
   }
 }
 
@@ -607,7 +609,9 @@ class _$_Fingerprint extends _Fingerprint {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_FingerprintToJson(this);
+    return _$$_FingerprintToJson(
+      this,
+    );
   }
 }
 
@@ -1289,7 +1293,9 @@ class _$_FidoCredential implements _FidoCredential {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_FidoCredentialToJson(this);
+    return _$$_FidoCredentialToJson(
+      this,
+    );
   }
 }
 

lib/management/models.freezed.dart

@@ -193,7 +193,9 @@ class _$_DeviceConfig implements _DeviceConfig {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_DeviceConfigToJson(this);
+    return _$$_DeviceConfigToJson(
+      this,
+    );
   }
 }
 
@@ -494,7 +496,9 @@ class _$_DeviceInfo implements _DeviceInfo {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_DeviceInfoToJson(this);
+    return _$$_DeviceInfoToJson(
+      this,
+    );
   }
 }
 

lib/management/models.g.dart

@@ -19,7 +19,7 @@ _$_DeviceConfig _$$_DeviceConfigFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$$_DeviceConfigToJson(_$_DeviceConfig instance) =>
     <String, dynamic>{
       'enabled_capabilities': instance.enabledCapabilities
-          .map((k, e) => MapEntry(_$TransportEnumMap[k], e)),
+          .map((k, e) => MapEntry(_$TransportEnumMap[k]!, e)),
       'auto_eject_timeout': instance.autoEjectTimeout,
       'challenge_response_timeout': instance.challengeResponseTimeout,
       'device_flags': instance.deviceFlags,
@@ -49,9 +49,9 @@ Map<String, dynamic> _$$_DeviceInfoToJson(_$_DeviceInfo instance) =>
       'config': instance.config,
       'serial': instance.serial,
       'version': instance.version,
-      'form_factor': _$FormFactorEnumMap[instance.formFactor],
+      'form_factor': _$FormFactorEnumMap[instance.formFactor]!,
       'supported_capabilities': instance.supportedCapabilities
-          .map((k, e) => MapEntry(_$TransportEnumMap[k], e)),
+          .map((k, e) => MapEntry(_$TransportEnumMap[k]!, e)),
       'is_locked': instance.isLocked,
       'is_fips': instance.isFips,
       'is_sky': instance.isSky,

lib/oath/models.freezed.dart

@@ -235,7 +235,9 @@ class _$_OathCredential implements _OathCredential {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_OathCredentialToJson(this);
+    return _$$_OathCredentialToJson(
+      this,
+    );
   }
 }
 
@@ -413,7 +415,9 @@ class _$_OathCode implements _OathCode {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_OathCodeToJson(this);
+    return _$$_OathCodeToJson(
+      this,
+    );
   }
 }
 
@@ -588,7 +592,9 @@ class _$_OathPair implements _OathPair {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_OathPairToJson(this);
+    return _$$_OathPairToJson(
+      this,
+    );
   }
 }
 
@@ -823,7 +829,9 @@ class _$_OathState implements _OathState {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_OathStateToJson(this);
+    return _$$_OathStateToJson(
+      this,
+    );
   }
 }
 
@@ -1106,7 +1114,9 @@ class _$_CredentialData extends _CredentialData {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_CredentialDataToJson(this);
+    return _$$_CredentialDataToJson(
+      this,
+    );
   }
 }
 

lib/oath/models.g.dart

@@ -23,7 +23,7 @@ Map<String, dynamic> _$$_OathCredentialToJson(_$_OathCredential instance) =>
       'id': instance.id,
       'issuer': instance.issuer,
       'name': instance.name,
-      'oath_type': _$OathTypeEnumMap[instance.oathType],
+      'oath_type': _$OathTypeEnumMap[instance.oathType]!,
       'period': instance.period,
       'touch_required': instance.touchRequired,
     };
@@ -75,7 +75,7 @@ Map<String, dynamic> _$$_OathStateToJson(_$_OathState instance) =>
       'has_key': instance.hasKey,
       'remembered': instance.remembered,
       'locked': instance.locked,
-      'keystore': _$KeystoreStateEnumMap[instance.keystore],
+      'keystore': _$KeystoreStateEnumMap[instance.keystore]!,
     };
 
 const _$KeystoreStateEnumMap = {
@@ -104,8 +104,8 @@ Map<String, dynamic> _$$_CredentialDataToJson(_$_CredentialData instance) =>
       'issuer': instance.issuer,
       'name': instance.name,
       'secret': instance.secret,
-      'oath_type': _$OathTypeEnumMap[instance.oathType],
-      'hash_algorithm': _$HashAlgorithmEnumMap[instance.hashAlgorithm],
+      'oath_type': _$OathTypeEnumMap[instance.oathType]!,
+      'hash_algorithm': _$HashAlgorithmEnumMap[instance.hashAlgorithm]!,
       'digits': instance.digits,
       'period': instance.period,
       'counter': instance.counter,

pubspec.lock

@@ -56,7 +56,7 @@ packages:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   build_daemon:
     dependency: transitive
     description:
@@ -77,7 +77,7 @@ packages:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.11"
+    version: "2.2.0"
   build_runner_core:
     dependency: transitive
     description:
@@ -98,7 +98,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.3.3"
+    version: "8.4.0"
   characters:
     dependency: transitive
     description:
@@ -244,14 +244,14 @@ packages:
       name: freezed
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0+1"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.1.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -317,14 +317,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.5.0"
+    version: "4.6.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.2.0"
+    version: "6.3.1"
   lints:
     dependency: transitive
     description:
@@ -408,7 +408,7 @@ packages:
       name: pigeon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.3"
+    version: "3.2.4"
   platform:
     dependency: transitive
     description:
@@ -644,7 +644,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.4"
+    version: "6.1.5"
   url_launcher_android:
     dependency: transitive
     description:

pubspec.yaml

@@ -43,13 +43,13 @@ dependencies:
   collection: ^1.16.0
   shared_preferences: ^2.0.12
   flutter_riverpod: ^1.0.0
-  json_annotation: ^4.5.0
+  json_annotation: ^4.6.0
   freezed_annotation: ^2.0.3
   window_manager: ^0.2.0
   qrscanner_zxing:
     path: android/flutter_plugins/qrscanner_zxing
   desktop_drop: ^0.3.3
-  url_launcher: ^6.1.2
+  url_launcher: ^6.1.5
 
 dev_dependencies:
   integration_test:
@@ -64,10 +64,10 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^2.0.1
 
-  build_runner: ^2.1.4
-  freezed: ^2.0.3
-  json_serializable: ^6.0.0
-  pigeon: ^3.1.6
+  build_runner: ^2.2.0
+  freezed: ^2.1.0+1
+  json_serializable: ^6.3.1
+  pigeon: ^3.2.4
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec