diff --git a/examples/mirai_gallery/pubspec.lock b/examples/mirai_gallery/pubspec.lock index d79c901e..7546ae9b 100644 --- a/examples/mirai_gallery/pubspec.lock +++ b/examples/mirai_gallery/pubspec.lock @@ -390,23 +390,26 @@ packages: mirai: dependency: "direct main" description: - path: "../../packages/mirai" - relative: true - source: path + name: mirai + sha256: "7c14ce9731f2779f517735402127c03631e7243427e672ea620101ae8e0f1fb4" + url: "https://pub.dev" + source: hosted version: "0.5.1" mirai_framework: - dependency: "direct overridden" + dependency: transitive description: - path: "../../packages/mirai_framework" - relative: true - source: path + name: mirai_framework + sha256: a8fcd5cb782bb054587d7cddcbc688f5f9392017ac0a43f8df6a11872bee98db + url: "https://pub.dev" + source: hosted version: "0.0.2" mirai_webview: dependency: "direct main" description: - path: "../../packages/mirai_webview" - relative: true - source: path + name: mirai_webview + sha256: baf0048263357e1b69e2caa19d43823c96946628443b4f41ae6f5737452cb7dc + url: "https://pub.dev" + source: hosted version: "0.0.2" nested: dependency: transitive @@ -654,5 +657,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.1.0 <4.0.0" flutter: ">=3.7.0" diff --git a/examples/mirai_gallery/pubspec_overrides.yaml b/examples/mirai_gallery/pubspec_overrides.yaml deleted file mode 100644 index c1d7530b..00000000 --- a/examples/mirai_gallery/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: mirai,mirai_framework,mirai_webview -dependency_overrides: - mirai: - path: ../../packages/mirai - mirai_framework: - path: ../../packages/mirai_framework - mirai_webview: - path: ../../packages/mirai_webview diff --git a/packages/mirai/lib/src/framework/mirai.dart b/packages/mirai/lib/src/framework/mirai.dart index be16f595..1e249b25 100644 --- a/packages/mirai/lib/src/framework/mirai.dart +++ b/packages/mirai/lib/src/framework/mirai.dart @@ -6,8 +6,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:mirai/src/action_parsers/action_parsers.dart'; import 'package:mirai/src/framework/mirai_registry.dart'; -import 'package:mirai/src/network/mirai_network.dart'; -import 'package:mirai/src/network/mirai_request.dart'; import 'package:mirai/src/parsers/mirai_align/mirai_align_parser.dart'; import 'package:mirai/src/parsers/mirai_center/mirai_center_parser.dart'; import 'package:mirai/src/parsers/mirai_check_box_widget/mirai_check_box_widget_parser.dart'; diff --git a/packages/mirai/lib/src/parsers/mirai_align/mirai_align.freezed.dart b/packages/mirai/lib/src/parsers/mirai_align/mirai_align.freezed.dart index c286282e..e5b1cd10 100644 --- a/packages/mirai/lib/src/parsers/mirai_align/mirai_align.freezed.dart +++ b/packages/mirai/lib/src/parsers/mirai_align/mirai_align.freezed.dart @@ -84,11 +84,11 @@ class _$MiraiAlignCopyWithImpl<$Res, $Val extends MiraiAlign> } /// @nodoc -abstract class _$$MiraiAlignImplCopyWith<$Res> +abstract class _$$_MiraiAlignCopyWith<$Res> implements $MiraiAlignCopyWith<$Res> { - factory _$$MiraiAlignImplCopyWith( - _$MiraiAlignImpl value, $Res Function(_$MiraiAlignImpl) then) = - __$$MiraiAlignImplCopyWithImpl<$Res>; + factory _$$_MiraiAlignCopyWith( + _$_MiraiAlign value, $Res Function(_$_MiraiAlign) then) = + __$$_MiraiAlignCopyWithImpl<$Res>; @override @useResult $Res call( @@ -99,11 +99,11 @@ abstract class _$$MiraiAlignImplCopyWith<$Res> } /// @nodoc -class __$$MiraiAlignImplCopyWithImpl<$Res> - extends _$MiraiAlignCopyWithImpl<$Res, _$MiraiAlignImpl> - implements _$$MiraiAlignImplCopyWith<$Res> { - __$$MiraiAlignImplCopyWithImpl( - _$MiraiAlignImpl _value, $Res Function(_$MiraiAlignImpl) _then) +class __$$_MiraiAlignCopyWithImpl<$Res> + extends _$MiraiAlignCopyWithImpl<$Res, _$_MiraiAlign> + implements _$$_MiraiAlignCopyWith<$Res> { + __$$_MiraiAlignCopyWithImpl( + _$_MiraiAlign _value, $Res Function(_$_MiraiAlign) _then) : super(_value, _then); @pragma('vm:prefer-inline') @@ -114,7 +114,7 @@ class __$$MiraiAlignImplCopyWithImpl<$Res> Object? heightFactor = freezed, Object? child = freezed, }) { - return _then(_$MiraiAlignImpl( + return _then(_$_MiraiAlign( alignment: null == alignment ? _value.alignment : alignment // ignore: cast_nullable_to_non_nullable @@ -137,16 +137,16 @@ class __$$MiraiAlignImplCopyWithImpl<$Res> /// @nodoc @JsonSerializable() -class _$MiraiAlignImpl implements _MiraiAlign { - const _$MiraiAlignImpl( +class _$_MiraiAlign implements _MiraiAlign { + const _$_MiraiAlign( {this.alignment = MiraiAlignmentDirectional.center, this.widthFactor, this.heightFactor, final Map? child}) : _child = child; - factory _$MiraiAlignImpl.fromJson(Map json) => - _$$MiraiAlignImplFromJson(json); + factory _$_MiraiAlign.fromJson(Map json) => + _$$_MiraiAlignFromJson(json); @override @JsonKey() @@ -174,7 +174,7 @@ class _$MiraiAlignImpl implements _MiraiAlign { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _$MiraiAlignImpl && + other is _$_MiraiAlign && (identical(other.alignment, alignment) || other.alignment == alignment) && (identical(other.widthFactor, widthFactor) || @@ -192,12 +192,12 @@ class _$MiraiAlignImpl implements _MiraiAlign { @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') - _$$MiraiAlignImplCopyWith<_$MiraiAlignImpl> get copyWith => - __$$MiraiAlignImplCopyWithImpl<_$MiraiAlignImpl>(this, _$identity); + _$$_MiraiAlignCopyWith<_$_MiraiAlign> get copyWith => + __$$_MiraiAlignCopyWithImpl<_$_MiraiAlign>(this, _$identity); @override Map toJson() { - return _$$MiraiAlignImplToJson( + return _$$_MiraiAlignToJson( this, ); } @@ -208,10 +208,10 @@ abstract class _MiraiAlign implements MiraiAlign { {final MiraiAlignmentDirectional alignment, final double? widthFactor, final double? heightFactor, - final Map? child}) = _$MiraiAlignImpl; + final Map? child}) = _$_MiraiAlign; factory _MiraiAlign.fromJson(Map json) = - _$MiraiAlignImpl.fromJson; + _$_MiraiAlign.fromJson; @override MiraiAlignmentDirectional get alignment; @@ -223,6 +223,6 @@ abstract class _MiraiAlign implements MiraiAlign { Map? get child; @override @JsonKey(ignore: true) - _$$MiraiAlignImplCopyWith<_$MiraiAlignImpl> get copyWith => + _$$_MiraiAlignCopyWith<_$_MiraiAlign> get copyWith => throw _privateConstructorUsedError; } diff --git a/packages/mirai/lib/src/parsers/mirai_align/mirai_align.g.dart b/packages/mirai/lib/src/parsers/mirai_align/mirai_align.g.dart index 6b56d670..4d886f4c 100644 --- a/packages/mirai/lib/src/parsers/mirai_align/mirai_align.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_align/mirai_align.g.dart @@ -6,8 +6,8 @@ part of 'mirai_align.dart'; // JsonSerializableGenerator // ************************************************************************** -_$MiraiAlignImpl _$$MiraiAlignImplFromJson(Map json) => - _$MiraiAlignImpl( +_$_MiraiAlign _$$_MiraiAlignFromJson(Map json) => + _$_MiraiAlign( alignment: $enumDecodeNullable( _$MiraiAlignmentDirectionalEnumMap, json['alignment']) ?? MiraiAlignmentDirectional.center, @@ -16,7 +16,7 @@ _$MiraiAlignImpl _$$MiraiAlignImplFromJson(Map json) => child: json['child'] as Map?, ); -Map _$$MiraiAlignImplToJson(_$MiraiAlignImpl instance) => +Map _$$_MiraiAlignToJson(_$_MiraiAlign instance) => { 'alignment': _$MiraiAlignmentDirectionalEnumMap[instance.alignment]!, 'widthFactor': instance.widthFactor, diff --git a/packages/mirai/pubspec_overrides.yaml b/packages/mirai/pubspec_overrides.yaml deleted file mode 100644 index 9c1a1d25..00000000 --- a/packages/mirai/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: mirai_framework -dependency_overrides: - mirai_framework: - path: ../mirai_framework diff --git a/packages/mirai_webview/pubspec_overrides.yaml b/packages/mirai_webview/pubspec_overrides.yaml deleted file mode 100644 index 9c1a1d25..00000000 --- a/packages/mirai_webview/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: mirai_framework -dependency_overrides: - mirai_framework: - path: ../mirai_framework