From 888c1d618df230a94f5485483e45b652f94e3b75 Mon Sep 17 00:00:00 2001 From: Adam Velebil Date: Thu, 21 Jul 2022 16:37:58 +0200 Subject: [PATCH 1/3] update versions and lockfile --- pubspec.lock | 18 +++++++++--------- pubspec.yaml | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index a44e9fe9..db340a89 100755 --- a/pubspec.lock +++ b/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: diff --git a/pubspec.yaml b/pubspec.yaml index 0057c827..0ec04ca2 100644 --- a/pubspec.yaml +++ b/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 From 56da20b442dabd4dfb14b40f5d72522f39bcca87 Mon Sep 17 00:00:00 2001 From: Adam Velebil Date: Thu, 21 Jul 2022 16:38:20 +0200 Subject: [PATCH 2/3] regenerate pigeon files --- .../src/main/java/com/yubico/authenticator/api/Pigeon.java | 2 +- lib/android/api/impl.dart | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/java/com/yubico/authenticator/api/Pigeon.java b/android/app/src/main/java/com/yubico/authenticator/api/Pigeon.java index 49e70568..c0026a77 100644 --- a/android/app/src/main/java/com/yubico/authenticator/api/Pigeon.java +++ b/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; diff --git a/lib/android/api/impl.dart b/lib/android/api/impl.dart index 4974db18..2f931643 100644 --- a/lib/android/api/impl.dart +++ b/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; From 89d9a649416034671a206b50b82bb90b58068d03 Mon Sep 17 00:00:00 2001 From: Adam Velebil Date: Thu, 21 Jul 2022 16:38:45 +0200 Subject: [PATCH 3/3] regenerate freezed files --- lib/app/models.freezed.dart | 0 lib/core/models.freezed.dart | 0 lib/core/models.g.dart | 0 lib/desktop/models.freezed.dart | 16 ++++++++++++---- lib/desktop/models.g.dart | 0 lib/fido/models.freezed.dart | 12 +++++++++--- lib/fido/models.g.dart | 0 lib/management/models.freezed.dart | 8 ++++++-- lib/management/models.g.dart | 6 +++--- lib/oath/models.freezed.dart | 20 +++++++++++++++----- lib/oath/models.g.dart | 8 ++++---- 11 files changed, 49 insertions(+), 21 deletions(-) mode change 100755 => 100644 lib/app/models.freezed.dart mode change 100755 => 100644 lib/core/models.freezed.dart mode change 100755 => 100644 lib/core/models.g.dart mode change 100755 => 100644 lib/desktop/models.freezed.dart mode change 100755 => 100644 lib/desktop/models.g.dart mode change 100755 => 100644 lib/fido/models.freezed.dart mode change 100755 => 100644 lib/fido/models.g.dart mode change 100755 => 100644 lib/management/models.freezed.dart mode change 100755 => 100644 lib/management/models.g.dart mode change 100755 => 100644 lib/oath/models.freezed.dart mode change 100755 => 100644 lib/oath/models.g.dart diff --git a/lib/app/models.freezed.dart b/lib/app/models.freezed.dart old mode 100755 new mode 100644 diff --git a/lib/core/models.freezed.dart b/lib/core/models.freezed.dart old mode 100755 new mode 100644 diff --git a/lib/core/models.g.dart b/lib/core/models.g.dart old mode 100755 new mode 100644 diff --git a/lib/desktop/models.freezed.dart b/lib/desktop/models.freezed.dart old mode 100755 new mode 100644 index cfdb7ee5..426515b4 --- a/lib/desktop/models.freezed.dart +++ b/lib/desktop/models.freezed.dart @@ -262,7 +262,9 @@ class _$Success implements Success { @override Map toJson() { - return _$$SuccessToJson(this); + return _$$SuccessToJson( + this, + ); } } @@ -436,7 +438,9 @@ class _$Signal implements Signal { @override Map toJson() { - return _$$SignalToJson(this); + return _$$SignalToJson( + this, + ); } } @@ -623,7 +627,9 @@ class _$RpcError implements RpcError { @override Map toJson() { - return _$$RpcErrorToJson(this); + return _$$RpcErrorToJson( + this, + ); } } @@ -769,7 +775,9 @@ class _$_RpcState implements _RpcState { @override Map toJson() { - return _$$_RpcStateToJson(this); + return _$$_RpcStateToJson( + this, + ); } } diff --git a/lib/desktop/models.g.dart b/lib/desktop/models.g.dart old mode 100755 new mode 100644 diff --git a/lib/fido/models.freezed.dart b/lib/fido/models.freezed.dart old mode 100755 new mode 100644 index b573ef00..9574a575 --- a/lib/fido/models.freezed.dart +++ b/lib/fido/models.freezed.dart @@ -148,7 +148,9 @@ class _$_FidoState extends _FidoState { @override Map toJson() { - return _$$_FidoStateToJson(this); + return _$$_FidoStateToJson( + this, + ); } } @@ -607,7 +609,9 @@ class _$_Fingerprint extends _Fingerprint { @override Map toJson() { - return _$$_FingerprintToJson(this); + return _$$_FingerprintToJson( + this, + ); } } @@ -1289,7 +1293,9 @@ class _$_FidoCredential implements _FidoCredential { @override Map toJson() { - return _$$_FidoCredentialToJson(this); + return _$$_FidoCredentialToJson( + this, + ); } } diff --git a/lib/fido/models.g.dart b/lib/fido/models.g.dart old mode 100755 new mode 100644 diff --git a/lib/management/models.freezed.dart b/lib/management/models.freezed.dart old mode 100755 new mode 100644 index e6b5b7e0..2144983e --- a/lib/management/models.freezed.dart +++ b/lib/management/models.freezed.dart @@ -193,7 +193,9 @@ class _$_DeviceConfig implements _DeviceConfig { @override Map toJson() { - return _$$_DeviceConfigToJson(this); + return _$$_DeviceConfigToJson( + this, + ); } } @@ -494,7 +496,9 @@ class _$_DeviceInfo implements _DeviceInfo { @override Map toJson() { - return _$$_DeviceInfoToJson(this); + return _$$_DeviceInfoToJson( + this, + ); } } diff --git a/lib/management/models.g.dart b/lib/management/models.g.dart old mode 100755 new mode 100644 index 7fe9b996..4f7b9ac0 --- a/lib/management/models.g.dart +++ b/lib/management/models.g.dart @@ -19,7 +19,7 @@ _$_DeviceConfig _$$_DeviceConfigFromJson(Map json) => Map _$$_DeviceConfigToJson(_$_DeviceConfig instance) => { '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 _$$_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, diff --git a/lib/oath/models.freezed.dart b/lib/oath/models.freezed.dart old mode 100755 new mode 100644 index 4d4d94f4..1e72bb0b --- a/lib/oath/models.freezed.dart +++ b/lib/oath/models.freezed.dart @@ -235,7 +235,9 @@ class _$_OathCredential implements _OathCredential { @override Map toJson() { - return _$$_OathCredentialToJson(this); + return _$$_OathCredentialToJson( + this, + ); } } @@ -413,7 +415,9 @@ class _$_OathCode implements _OathCode { @override Map toJson() { - return _$$_OathCodeToJson(this); + return _$$_OathCodeToJson( + this, + ); } } @@ -588,7 +592,9 @@ class _$_OathPair implements _OathPair { @override Map toJson() { - return _$$_OathPairToJson(this); + return _$$_OathPairToJson( + this, + ); } } @@ -823,7 +829,9 @@ class _$_OathState implements _OathState { @override Map toJson() { - return _$$_OathStateToJson(this); + return _$$_OathStateToJson( + this, + ); } } @@ -1106,7 +1114,9 @@ class _$_CredentialData extends _CredentialData { @override Map toJson() { - return _$$_CredentialDataToJson(this); + return _$$_CredentialDataToJson( + this, + ); } } diff --git a/lib/oath/models.g.dart b/lib/oath/models.g.dart old mode 100755 new mode 100644 index 1137f7c0..d1dbfa98 --- a/lib/oath/models.g.dart +++ b/lib/oath/models.g.dart @@ -23,7 +23,7 @@ Map _$$_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 _$$_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 _$$_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,