diff --git a/FLUTTER_VERSION b/FLUTTER_VERSION index d9b2ac520b9c..b7bc73b80831 100644 --- a/FLUTTER_VERSION +++ b/FLUTTER_VERSION @@ -1 +1 @@ -3.22.3 \ No newline at end of file +3.24.0 \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md index 5b6a8db290e6..fef0db520b4d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,18 +2,18 @@ ## Supported Versions -| Version | Supported | | -| --------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------- | -| 2.2-dev | :warning: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0-beta.0) | -| 2.1.1 | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1) | -| 2.0.3 | :x: | [Docs](https://butterfly.linwood.dev/docs/2.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.0.3) | -| 1.6.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.6/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.6.1) | -| 1.5.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.5/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.5.1) | -| 1.4.4 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.4/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.4.4) | -| 1.3.2 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.3/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.3.2) | -| 1.2.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.2.1) | -| 1.1.2 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.1.2) | -| 1.0.0 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.0.0) | +| Version | Supported | | +| ------- | ------------------ | ---------------------------------------------------------------------------------------------------------------------------------- | +| 2.2-dev | :warning: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0-beta.1) | +| 2.1.1 | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1) | +| 2.0.3 | :x: | [Docs](https://butterfly.linwood.dev/docs/2.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.0.3) | +| 1.6.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.6/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.6.1) | +| 1.5.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.5/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.5.1) | +| 1.4.4 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.4/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.4.4) | +| 1.3.2 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.3/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.3.2) | +| 1.2.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.2.1) | +| 1.1.2 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.1.2) | +| 1.0.0 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.0.0) | Older versions can be found [here](https://butterfly.linwood.dev/community/pre-1-0). diff --git a/api/pubspec.lock b/api/pubspec.lock index 8135b64d83dd..a56b82f2fa7b 100644 --- a/api/pubspec.lock +++ b/api/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77" url: "https://pub.dev" source: hosted - version: "68.0.0" + version: "73.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.1.0" + version: "0.3.2" analyzer: dependency: "direct dev" description: name: analyzer - sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.8.0" archive: dependency: "direct main" description: @@ -98,18 +98,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.12" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.2" built_collection: dependency: transitive description: @@ -323,10 +323,10 @@ packages: dependency: transitive description: name: macros - sha256: "12e8a9842b5a7390de7a781ec63d793527582398d16ea26c60fed58833c9ae79" + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" url: "https://pub.dev" source: hosted - version: "0.1.0-main.0" + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -664,4 +664,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0-259.0.dev <4.0.0" diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock index 68dacaf41ddc..c26e1b0a9fe1 100644 --- a/app/android/Gemfile.lock +++ b/app/android/Gemfile.lock @@ -10,7 +10,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.961.0) + aws-partitions (1.962.0) aws-sdk-core (3.201.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -125,7 +125,7 @@ GEM google-apis-core (>= 0.15.0, < 2.a) google-apis-storage_v1 (0.41.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) diff --git a/app/lib/cubits/current_index.freezed.dart b/app/lib/cubits/current_index.freezed.dart index 74c2fd148b8f..c89579d05116 100644 --- a/app/lib/cubits/current_index.freezed.dart +++ b/app/lib/cubits/current_index.freezed.dart @@ -53,7 +53,9 @@ mixin _$CurrentIndex { bool get areaNavigatorExact => throw _privateConstructorUsedError; bool get areaNavigatorAsk => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + /// Create a copy of CurrentIndex + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $CurrentIndexCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -110,6 +112,8 @@ class _$CurrentIndexCopyWithImpl<$Res, $Val extends CurrentIndex> // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of CurrentIndex + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -273,6 +277,8 @@ class _$CurrentIndexCopyWithImpl<$Res, $Val extends CurrentIndex> ) as $Val); } + /// Create a copy of CurrentIndex + /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $ViewOptionCopyWith<$Res> get viewOption { @@ -335,6 +341,8 @@ class __$$CurrentIndexImplCopyWithImpl<$Res> _$CurrentIndexImpl _value, $Res Function(_$CurrentIndexImpl) _then) : super(_value, _then); + /// Create a copy of CurrentIndex + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -664,7 +672,9 @@ class _$CurrentIndexImpl extends _CurrentIndex { return 'CurrentIndex(index: $index, handler: $handler, cameraViewport: $cameraViewport, settingsCubit: $settingsCubit, transformCubit: $transformCubit, networkingService: $networkingService, temporaryHandler: $temporaryHandler, foregrounds: $foregrounds, selection: $selection, pinned: $pinned, temporaryForegrounds: $temporaryForegrounds, networkingForegrounds: $networkingForegrounds, cursor: $cursor, temporaryCursor: $temporaryCursor, temporaryClicked: $temporaryClicked, lastPosition: $lastPosition, pointers: $pointers, buttons: $buttons, location: $location, embedding: $embedding, saved: $saved, currentlySaving: $currentlySaving, toolbar: $toolbar, temporaryToolbar: $temporaryToolbar, rendererStates: $rendererStates, temporaryRendererStates: $temporaryRendererStates, viewOption: $viewOption, hideUi: $hideUi, areaNavigatorCreate: $areaNavigatorCreate, areaNavigatorExact: $areaNavigatorExact, areaNavigatorAsk: $areaNavigatorAsk)'; } - @JsonKey(ignore: true) + /// Create a copy of CurrentIndex + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$CurrentIndexImplCopyWith<_$CurrentIndexImpl> get copyWith => @@ -768,8 +778,11 @@ abstract class _CurrentIndex extends CurrentIndex { bool get areaNavigatorExact; @override bool get areaNavigatorAsk; + + /// Create a copy of CurrentIndex + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$CurrentIndexImplCopyWith<_$CurrentIndexImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/app/lib/cubits/settings.freezed.dart b/app/lib/cubits/settings.freezed.dart index a1c504a96559..d2eb8d25d259 100644 --- a/app/lib/cubits/settings.freezed.dart +++ b/app/lib/cubits/settings.freezed.dart @@ -28,8 +28,12 @@ mixin _$InputConfiguration { int? get secondPenButton => throw _privateConstructorUsedError; int? get touch => throw _privateConstructorUsedError; + /// Serializes this InputConfiguration to a JSON map. Map toJson() => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + + /// Create a copy of InputConfiguration + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $InputConfigurationCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -60,6 +64,8 @@ class _$InputConfigurationCopyWithImpl<$Res, $Val extends InputConfiguration> // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of InputConfiguration + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -130,6 +136,8 @@ class __$$InputConfigurationImplCopyWithImpl<$Res> $Res Function(_$InputConfigurationImpl) _then) : super(_value, _then); + /// Create a copy of InputConfiguration + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -248,12 +256,14 @@ class _$InputConfigurationImpl extends _InputConfiguration (identical(other.touch, touch) || other.touch == touch)); } - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) @override int get hashCode => Object.hash(runtimeType, leftMouse, middleMouse, rightMouse, pen, firstPenButton, secondPenButton, touch); - @JsonKey(ignore: true) + /// Create a copy of InputConfiguration + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$InputConfigurationImplCopyWith<_$InputConfigurationImpl> get copyWith => @@ -296,8 +306,11 @@ abstract class _InputConfiguration extends InputConfiguration { int? get secondPenButton; @override int? get touch; + + /// Create a copy of InputConfiguration + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$InputConfigurationImplCopyWith<_$InputConfigurationImpl> get copyWith => throw _privateConstructorUsedError; } @@ -349,7 +362,9 @@ mixin _$ButterflySettings { int get toolbarRows => throw _privateConstructorUsedError; bool get hideCursorWhileDrawing => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + /// Create a copy of ButterflySettings + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $ButterflySettingsCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -418,6 +433,8 @@ class _$ButterflySettingsCopyWithImpl<$Res, $Val extends ButterflySettings> // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of ButterflySettings + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -641,6 +658,8 @@ class _$ButterflySettingsCopyWithImpl<$Res, $Val extends ButterflySettings> ) as $Val); } + /// Create a copy of ButterflySettings + /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $InputConfigurationCopyWith<$Res> get inputConfiguration { @@ -716,6 +735,8 @@ class __$$ButterflySettingsImplCopyWithImpl<$Res> $Res Function(_$ButterflySettingsImpl) _then) : super(_value, _then); + /// Create a copy of ButterflySettings + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -1344,7 +1365,9 @@ class _$ButterflySettingsImpl extends _ButterflySettings hideCursorWhileDrawing ]); - @JsonKey(ignore: true) + /// Create a copy of ButterflySettings + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$ButterflySettingsImplCopyWith<_$ButterflySettingsImpl> get copyWith => @@ -1485,8 +1508,11 @@ abstract class _ButterflySettings extends ButterflySettings { int get toolbarRows; @override bool get hideCursorWhileDrawing; + + /// Create a copy of ButterflySettings + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$ButterflySettingsImplCopyWith<_$ButterflySettingsImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/app/lib/models/label.freezed.dart b/app/lib/models/label.freezed.dart index 8310bbcfaf34..ccbf75a2cb88 100644 --- a/app/lib/models/label.freezed.dart +++ b/app/lib/models/label.freezed.dart @@ -22,7 +22,9 @@ mixin _$LabelContext { double get zoom => throw _privateConstructorUsedError; TextSelection get selection => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $LabelContextCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -50,6 +52,8 @@ class _$LabelContextCopyWithImpl<$Res, $Val extends LabelContext> // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -109,6 +113,8 @@ class __$$TextContextImplCopyWithImpl<$Res> _$TextContextImpl _value, $Res Function(_$TextContextImpl) _then) : super(_value, _then); + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -157,6 +163,8 @@ class __$$TextContextImplCopyWithImpl<$Res> )); } + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $ParagraphPropertyCopyWith<$Res>? get forcedProperty { @@ -169,6 +177,8 @@ class __$$TextContextImplCopyWithImpl<$Res> }); } + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $SpanPropertyCopyWith<$Res>? get forcedSpanProperty { @@ -244,7 +254,9 @@ class _$TextContextImpl extends TextContext { int get hashCode => Object.hash(runtimeType, tool, textPainter, element, zoom, selection, forcedProperty, forcedSpanProperty, forceParagraph); - @JsonKey(ignore: true) + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$TextContextImplCopyWith<_$TextContextImpl> get copyWith => @@ -276,8 +288,11 @@ abstract class TextContext extends LabelContext { txt.ParagraphProperty? get forcedProperty; txt.SpanProperty? get forcedSpanProperty; bool? get forceParagraph; + + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$TextContextImplCopyWith<_$TextContextImpl> get copyWith => throw _privateConstructorUsedError; } @@ -306,6 +321,8 @@ class __$$MarkdownContextImplCopyWithImpl<$Res> _$MarkdownContextImpl _value, $Res Function(_$MarkdownContextImpl) _then) : super(_value, _then); + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -387,7 +404,9 @@ class _$MarkdownContextImpl extends MarkdownContext { int get hashCode => Object.hash(runtimeType, tool, textPainter, element, zoom, selection); - @JsonKey(ignore: true) + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$MarkdownContextImplCopyWith<_$MarkdownContextImpl> get copyWith => @@ -414,8 +433,11 @@ abstract class MarkdownContext extends LabelContext { double get zoom; @override TextSelection get selection; + + /// Create a copy of LabelContext + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$MarkdownContextImplCopyWith<_$MarkdownContextImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/app/lib/services/network.freezed.dart b/app/lib/services/network.freezed.dart index a5deb4ff3bd1..864d82b4cef3 100644 --- a/app/lib/services/network.freezed.dart +++ b/app/lib/services/network.freezed.dart @@ -23,8 +23,12 @@ NetworkingInitMessage _$NetworkingInitMessageFromJson( mixin _$NetworkingInitMessage { List? get data => throw _privateConstructorUsedError; + /// Serializes this NetworkingInitMessage to a JSON map. Map toJson() => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + + /// Create a copy of NetworkingInitMessage + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $NetworkingInitMessageCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -49,6 +53,8 @@ class _$NetworkingInitMessageCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of NetworkingInitMessage + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -84,6 +90,8 @@ class __$$NetworkingInitMessageImplCopyWithImpl<$Res> $Res Function(_$NetworkingInitMessageImpl) _then) : super(_value, _then); + /// Create a copy of NetworkingInitMessage + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -139,12 +147,14 @@ class _$NetworkingInitMessageImpl const DeepCollectionEquality().equals(other._data, _data)); } - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) @override int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(_data)); - @JsonKey(ignore: true) + /// Create a copy of NetworkingInitMessage + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$NetworkingInitMessageImplCopyWith<_$NetworkingInitMessageImpl> @@ -168,8 +178,11 @@ abstract class _NetworkingInitMessage implements NetworkingInitMessage { @override List? get data; + + /// Create a copy of NetworkingInitMessage + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$NetworkingInitMessageImplCopyWith<_$NetworkingInitMessageImpl> get copyWith => throw _privateConstructorUsedError; } @@ -184,8 +197,12 @@ mixin _$NetworkingUser { Point? get cursor => throw _privateConstructorUsedError; List? get foreground => throw _privateConstructorUsedError; + /// Serializes this NetworkingUser to a JSON map. Map toJson() => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + + /// Create a copy of NetworkingUser + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $NetworkingUserCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -211,6 +228,8 @@ class _$NetworkingUserCopyWithImpl<$Res, $Val extends NetworkingUser> // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of NetworkingUser + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -251,6 +270,8 @@ class __$$NetworkingUserImplCopyWithImpl<$Res> _$NetworkingUserImpl _value, $Res Function(_$NetworkingUserImpl) _then) : super(_value, _then); + /// Create a copy of NetworkingUser + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -320,12 +341,14 @@ class _$NetworkingUserImpl .equals(other._foreground, _foreground)); } - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) @override int get hashCode => Object.hash( runtimeType, cursor, const DeepCollectionEquality().hash(_foreground)); - @JsonKey(ignore: true) + /// Create a copy of NetworkingUser + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$NetworkingUserImplCopyWith<_$NetworkingUserImpl> get copyWith => @@ -353,8 +376,11 @@ abstract class _NetworkingUser implements NetworkingUser { Point? get cursor; @override List? get foreground; + + /// Create a copy of NetworkingUser + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$NetworkingUserImplCopyWith<_$NetworkingUserImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/app/pubspec.lock b/app/pubspec.lock index a06deb5ae534..32c62e9dbfb3 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -5,18 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" animations: dependency: "direct main" description: @@ -133,18 +138,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.12" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.2" built_collection: dependency: transitive description: @@ -172,10 +177,10 @@ packages: dependency: "direct main" description: name: camera - sha256: "2170a943dcb67be2af2c6bcda8775e74b41d4c02d6a4eb10bdc832ee185c4eea" + sha256: "26ff41045772153f222ffffecba711a206f670f5834d40ebf5eed3811692f167" url: "https://pub.dev" source: hosted - version: "0.11.0+1" + version: "0.11.0+2" camera_android_camerax: dependency: transitive description: @@ -204,10 +209,10 @@ packages: dependency: transitive description: name: camera_web - sha256: b9235ec0a2ce949daec546f1f3d86f05c3921ed31c7d9ab6b7c03214d152fc2d + sha256: "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f" url: "https://pub.dev" source: hosted - version: "0.3.4" + version: "0.3.5" camera_windows: dependency: "direct main" description: @@ -615,10 +620,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1 + sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.5.7" freezed_annotation: dependency: transitive description: @@ -652,10 +657,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: d380de0355788c5c784fe9f81b43fc833b903991c25ecc4e2a416a67faefa722 + sha256: ddc16d34b0d74cb313986918c0f0885a7ba2fc24d8fb8419de75f0015144ccfe url: "https://pub.dev" source: hosted - version: "14.2.2" + version: "14.2.3" graphs: dependency: transitive description: @@ -777,18 +782,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -840,6 +845,14 @@ packages: url: "https://github.com/LinwoodDev/dart_pkgs.git" source: git version: "0.0.1" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" markdown: dependency: "direct main" description: @@ -860,10 +873,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" material_leap: dependency: "direct main" description: @@ -877,10 +890,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: @@ -1072,10 +1085,10 @@ packages: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: @@ -1389,10 +1402,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" timing: dependency: transitive description: @@ -1477,10 +1490,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: a36e2d7981122fa185006b216eb6b5b97ede3f9a54b7a511bc966971ab98d049 + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.3" url_launcher_windows: dependency: transitive description: @@ -1533,10 +1546,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.4" watcher: dependency: transitive description: @@ -1626,5 +1639,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.1 <4.0.0" + dart: ">=3.5.0-259.0.dev <4.0.0" flutter: ">=3.22.0" diff --git a/docs/package.json b/docs/package.json index 3a6d45943f4c..c5697e97b45f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -10,9 +10,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/check": "^0.9.1", + "@astrojs/check": "^0.9.2", "@astrojs/react": "^3.6.1", - "@astrojs/starlight": "^0.25.3", + "@astrojs/starlight": "^0.25.4", "@phosphor-icons/react": "^2.1.7", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 23da9fe0580a..8603ff03980f 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -9,14 +9,14 @@ importers: .: dependencies: '@astrojs/check': - specifier: ^0.9.1 - version: 0.9.1(typescript@5.5.4) + specifier: ^0.9.2 + version: 0.9.2(typescript@5.5.4) '@astrojs/react': specifier: ^3.6.1 version: 3.6.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@5.3.5(sass@1.77.8)(terser@5.31.3)) '@astrojs/starlight': - specifier: ^0.25.3 - version: 0.25.3(astro@4.13.1(sass@1.77.8)(terser@5.31.3)(typescript@5.5.4)) + specifier: ^0.25.4 + version: 0.25.4(astro@4.13.1(sass@1.77.8)(terser@5.31.3)(typescript@5.5.4)) '@phosphor-icons/react': specifier: ^2.1.7 version: 2.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -58,20 +58,20 @@ packages: resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} - '@astrojs/check@0.9.1': - resolution: {integrity: sha512-VvN5ukVzg0IccKuZlI/pdsp4MSpHxWf9a36eOmS8Wpp+NM0MhJLYv3yvQC+qa472Kdf8DHEt/wmVZYwJUMFW+w==} + '@astrojs/check@0.9.2': + resolution: {integrity: sha512-6rWxtJTbd/ctdAlmla0CAvloGaai5IUTG0K21kctJHHGKJKnGH6Xana7m0zNOtHpVPEJi1SgC/TcsN+ltYt0Cg==} hasBin: true peerDependencies: typescript: ^5.0.0 - '@astrojs/compiler@2.10.1': - resolution: {integrity: sha512-XmM4j6BjvOVMag2xELq0JuG2yKOW8wgIu6dvb9BsjbGYmnvoStJn/pqEzVqc1EBszf2xYT7onIkftIOUz9AwrQ==} + '@astrojs/compiler@2.10.2': + resolution: {integrity: sha512-bvH+v8AirwpRWCkYJEyWYdc5Cs/BjG2ZTxIJzttHilXgfKJAdW2496KsUQKzf5j2tOHtaHXKKn9hb9WZiBGpEg==} '@astrojs/internal-helpers@0.4.1': resolution: {integrity: sha512-bMf9jFihO8YP940uD70SI/RDzIhUHJAolWVcO1v5PUivxGKvfLZTLTVVxEYzGYyPsA3ivdLNqMnL5VgmQySa+g==} - '@astrojs/language-server@2.13.1': - resolution: {integrity: sha512-Cl9ynfnge6+MaCpehYn7w9WrAE+sVS7onhxhMzCdqzPtIt/Yo5zIaiGZdu4QgvmOV/mdNBZCZgaTpAIeGjWwsQ==} + '@astrojs/language-server@2.13.2': + resolution: {integrity: sha512-l435EZLKjaUO/6iewJ7xqd3eHf3zAosVWG4woILbxluQcianBoNPepnnqAg7uUriZUaC44ae5v0Q+AfB8UI64g==} hasBin: true peerDependencies: prettier: ^3.0.0 @@ -107,8 +107,8 @@ packages: '@astrojs/sitemap@3.1.6': resolution: {integrity: sha512-1Qp2NvAzVImqA6y+LubKi1DVhve/hXXgFvB0szxiipzh7BvtuKe4oJJ9dXSqaubaTkt4nMa6dv6RCCAYeB6xaQ==} - '@astrojs/starlight@0.25.3': - resolution: {integrity: sha512-XNpGbZ54ungtzen4wQkPXn50D1ZquB51paWrZftA0jWxUkj4b/pP8PijAFrGFypydhvu7Dhl0DjD07lrnSSUhQ==} + '@astrojs/starlight@0.25.4': + resolution: {integrity: sha512-TRPgRsd5opi2tCXvh8rWizpLsJsRRXbYecULG5b/1x4BFyp40ZJVB77cLMjTj3lHwqWs0Sybtq5OBpOy6fuIEQ==} peerDependencies: astro: ^4.8.6 @@ -1030,8 +1030,8 @@ packages: eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - electron-to-chromium@1.5.4: - resolution: {integrity: sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==} + electron-to-chromium@1.5.5: + resolution: {integrity: sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA==} emmet@2.4.7: resolution: {integrity: sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==} @@ -1727,8 +1727,8 @@ packages: resolution: {integrity: sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==} engines: {node: '>=4'} - postcss@8.4.40: - resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==} + postcss@8.4.41: + resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} engines: {node: ^10 || ^12 || >=14} preferred-pm@4.0.0: @@ -2275,9 +2275,9 @@ snapshots: '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 - '@astrojs/check@0.9.1(typescript@5.5.4)': + '@astrojs/check@0.9.2(typescript@5.5.4)': dependencies: - '@astrojs/language-server': 2.13.1(typescript@5.5.4) + '@astrojs/language-server': 2.13.2(typescript@5.5.4) chokidar: 3.6.0 fast-glob: 3.3.2 kleur: 4.1.5 @@ -2287,13 +2287,13 @@ snapshots: - prettier - prettier-plugin-astro - '@astrojs/compiler@2.10.1': {} + '@astrojs/compiler@2.10.2': {} '@astrojs/internal-helpers@0.4.1': {} - '@astrojs/language-server@2.13.1(typescript@5.5.4)': + '@astrojs/language-server@2.13.2(typescript@5.5.4)': dependencies: - '@astrojs/compiler': 2.10.1 + '@astrojs/compiler': 2.10.2 '@jridgewell/sourcemap-codec': 1.5.0 '@volar/kit': 2.4.0-alpha.18(typescript@5.5.4) '@volar/language-core': 2.4.0-alpha.18 @@ -2379,7 +2379,7 @@ snapshots: stream-replace-string: 2.0.0 zod: 3.23.8 - '@astrojs/starlight@0.25.3(astro@4.13.1(sass@1.77.8)(terser@5.31.3)(typescript@5.5.4))': + '@astrojs/starlight@0.25.4(astro@4.13.1(sass@1.77.8)(terser@5.31.3)(typescript@5.5.4))': dependencies: '@astrojs/mdx': 3.1.3(astro@4.13.1(sass@1.77.8)(terser@5.31.3)(typescript@5.5.4)) '@astrojs/sitemap': 3.1.6 @@ -2668,8 +2668,8 @@ snapshots: hast-util-to-html: 9.0.1 hast-util-to-text: 4.0.2 hastscript: 9.0.0 - postcss: 8.4.40 - postcss-nested: 6.2.0(postcss@8.4.40) + postcss: 8.4.41 + postcss-nested: 6.2.0(postcss@8.4.41) unist-util-visit: 5.0.0 unist-util-visit-parents: 6.0.1 @@ -3093,7 +3093,7 @@ snapshots: astro@4.13.1(sass@1.77.8)(terser@5.31.3)(typescript@5.5.4): dependencies: - '@astrojs/compiler': 2.10.1 + '@astrojs/compiler': 2.10.2 '@astrojs/internal-helpers': 0.4.1 '@astrojs/markdown-remark': 5.2.0 '@astrojs/telemetry': 3.1.0 @@ -3203,7 +3203,7 @@ snapshots: browserslist@4.23.3: dependencies: caniuse-lite: 1.0.30001649 - electron-to-chromium: 1.5.4 + electron-to-chromium: 1.5.5 node-releases: 2.0.18 update-browserslist-db: 1.1.0(browserslist@4.23.3) @@ -3341,7 +3341,7 @@ snapshots: eastasianwidth@0.2.0: {} - electron-to-chromium@1.5.4: {} + electron-to-chromium@1.5.5: {} emmet@2.4.7: dependencies: @@ -4416,9 +4416,9 @@ snapshots: dependencies: find-up: 4.1.0 - postcss-nested@6.2.0(postcss@8.4.40): + postcss-nested@6.2.0(postcss@8.4.41): dependencies: - postcss: 8.4.40 + postcss: 8.4.41 postcss-selector-parser: 6.1.1 postcss-selector-parser@6.1.1: @@ -4426,7 +4426,7 @@ snapshots: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss@8.4.40: + postcss@8.4.41: dependencies: nanoid: 3.3.7 picocolors: 1.0.1 @@ -4918,7 +4918,7 @@ snapshots: vite@5.3.5(sass@1.77.8)(terser@5.31.3): dependencies: esbuild: 0.21.5 - postcss: 8.4.40 + postcss: 8.4.41 rollup: 4.20.0 optionalDependencies: fsevents: 2.3.3 diff --git a/metadata/en-US/changelogs/111.txt b/metadata/en-US/changelogs/111.txt new file mode 100644 index 000000000000..b4bc2162f577 --- /dev/null +++ b/metadata/en-US/changelogs/111.txt @@ -0,0 +1,3 @@ +* Upgrade to flutter 3.24 + +Read more here: https://linwood.dev/butterfly/2.2.0-beta.2 \ No newline at end of file