From b39dbb789c6157017cfa9fecbbe169f36d0ad1f2 Mon Sep 17 00:00:00 2001 From: man-y Date: Thu, 3 Oct 2024 10:32:11 +0300 Subject: [PATCH] Clean dependencies commit_hash:49a9da6e4fdf4d23866fb91b80c2110c621bfe86 --- .mapping.json | 2 +- client/flutter/divkit/CHANGELOG.md | 2 + .../flutter/divkit/example/ios/Podfile.lock | 27 +-- .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- client/flutter/divkit/example/pubspec.lock | 228 ++++++++++-------- client/flutter/divkit/example/pubspec.yaml | 2 + .../flutter/divkit/lib/src/core/divkit.dart | 23 +- .../lib/src/core/expression/expression.dart | 9 +- .../divkit/lib/src/core/runtime/runtime.dart | 2 +- .../{sync_runtime.dart => runtime_sync.dart} | 0 .../src/core/variable/variable_storage.dart | 8 +- .../core/widgets/image/div_image_widget.dart | 3 - .../core/widgets/state/div_state_model.dart | 4 +- client/flutter/divkit/pubspec.yaml | 1 - 15 files changed, 163 insertions(+), 152 deletions(-) rename client/flutter/divkit/lib/src/core/runtime/{sync_runtime.dart => runtime_sync.dart} (100%) diff --git a/.mapping.json b/.mapping.json index f75c22956..e464fbf93 100644 --- a/.mapping.json +++ b/.mapping.json @@ -10526,7 +10526,7 @@ "client/flutter/divkit/lib/src/core/runtime/members.dart":"divkit/public/client/flutter/divkit/lib/src/core/runtime/members.dart", "client/flutter/divkit/lib/src/core/runtime/parser.dart":"divkit/public/client/flutter/divkit/lib/src/core/runtime/parser.dart", "client/flutter/divkit/lib/src/core/runtime/runtime.dart":"divkit/public/client/flutter/divkit/lib/src/core/runtime/runtime.dart", - "client/flutter/divkit/lib/src/core/runtime/sync_runtime.dart":"divkit/public/client/flutter/divkit/lib/src/core/runtime/sync_runtime.dart", + "client/flutter/divkit/lib/src/core/runtime/runtime_sync.dart":"divkit/public/client/flutter/divkit/lib/src/core/runtime/runtime_sync.dart", "client/flutter/divkit/lib/src/core/state/state.dart":"divkit/public/client/flutter/divkit/lib/src/core/state/state.dart", "client/flutter/divkit/lib/src/core/state/state_id.dart":"divkit/public/client/flutter/divkit/lib/src/core/state/state_id.dart", "client/flutter/divkit/lib/src/core/state/state_manager.dart":"divkit/public/client/flutter/divkit/lib/src/core/state/state_manager.dart", diff --git a/client/flutter/divkit/CHANGELOG.md b/client/flutter/divkit/CHANGELOG.md index 9011d61cd..e76e5e9a4 100644 --- a/client/flutter/divkit/CHANGELOG.md +++ b/client/flutter/divkit/CHANGELOG.md @@ -1,5 +1,7 @@ ## 0.5.1-rc.1 +* Clean dependencies + ## 0.5.0 * Add full implementation on Dart of DivKit specification for calculating expressions: Runtime diff --git a/client/flutter/divkit/example/ios/Podfile.lock b/client/flutter/divkit/example/ios/Podfile.lock index 9964b57ad..4d8047229 100644 --- a/client/flutter/divkit/example/ios/Podfile.lock +++ b/client/flutter/divkit/example/ios/Podfile.lock @@ -11,17 +11,12 @@ PODS: - DivKit_Serialization (30.14.0): - VGSL (~> 6.0) - Flutter (1.0.0) - - FMDB (2.7.12): - - FMDB/standard (= 2.7.12) - - FMDB/Core (2.7.12) - - FMDB/standard (2.7.12): - - FMDB/Core - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - sqflite (0.0.2): + - sqflite (0.0.3): - Flutter - - FMDB (>= 2.7.5) + - FlutterMacOS - VGSL (6.4.0): - VGSLFundamentals (= 6.4.0) - VGSLNetworking (= 6.4.0) @@ -36,8 +31,8 @@ PODS: DEPENDENCIES: - DivKit (~> 30.0) - Flutter (from `Flutter`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) - - sqflite (from `.symlinks/plugins/sqflite/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - sqflite (from `.symlinks/plugins/sqflite/darwin`) SPEC REPOS: trunk: @@ -45,7 +40,6 @@ SPEC REPOS: - DivKit_LayoutKit - DivKit_LayoutKitInterface - DivKit_Serialization - - FMDB - VGSL - VGSLFundamentals - VGSLNetworking @@ -55,19 +49,18 @@ EXTERNAL SOURCES: Flutter: :path: Flutter path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/ios" + :path: ".symlinks/plugins/path_provider_foundation/darwin" sqflite: - :path: ".symlinks/plugins/sqflite/ios" + :path: ".symlinks/plugins/sqflite/darwin" SPEC CHECKSUMS: DivKit: cc64dacca7e17969ee8807b85f8f13750c2c2513 DivKit_LayoutKit: 5ff58184d402a70bf2d7de52e90576115871b5e5 DivKit_LayoutKitInterface: 43ba8a2bd5693439e93474875ecefbea8f6fba79 DivKit_Serialization: 46290b7e09f53bf398663b145d6caa74b2612281 - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - FMDB: 728731dd336af3936ce00f91d9d8495f5718a0e6 - path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c - sqflite: f7868cb717a559a515967bb4033af73521c7d3f4 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec VGSL: 14a67feafe2e6203546d4557f9259d8c705fcb83 VGSLFundamentals: 9cb06c36cb92a72c77b689a6f5c4802dd18eeb7e VGSLNetworking: 0146afd59633755bb3fab997b3a8450f8dcd5f27 @@ -75,4 +68,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 33f8f678415c6e69ec46d17ad643bfeacaa66957 -COCOAPODS: 1.13.0 +COCOAPODS: 1.15.2 diff --git a/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj b/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj index 452a6ba6b..4ece37e8c 100644 --- a/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj +++ b/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a33..5e31d3d34 100644 --- a/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =2.19.0 <3.0.0" - flutter: ">=3.7.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.16.6" diff --git a/client/flutter/divkit/example/pubspec.yaml b/client/flutter/divkit/example/pubspec.yaml index b6379c771..2ced036af 100644 --- a/client/flutter/divkit/example/pubspec.yaml +++ b/client/flutter/divkit/example/pubspec.yaml @@ -47,10 +47,12 @@ flutter: - assets/regression/accessibility/mode/ - assets/regression/action_animation/ - assets/regression/animations/ + - assets/regression/animations/animators/ - assets/regression/animations/lottie/ - assets/regression/animations/transition/ - assets/regression/animations/rive/ - assets/regression/gallery/ + - assets/regression/indicator/ - assets/regression/pager/ - assets/regression/variables/ - assets/regression/video/ diff --git a/client/flutter/divkit/lib/src/core/divkit.dart b/client/flutter/divkit/lib/src/core/divkit.dart index a3f71d258..4e9b3eae9 100644 --- a/client/flutter/divkit/lib/src/core/divkit.dart +++ b/client/flutter/divkit/lib/src/core/divkit.dart @@ -7,7 +7,6 @@ import 'package:divkit/src/utils/div_scaling_model.dart'; import 'package:divkit/src/utils/provider.dart'; import 'package:divkit/src/utils/trace.dart'; import 'package:flutter/widgets.dart'; -import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:meta/meta.dart'; /// The main widget embedding DivKit BDUI in the Flutter host application. @@ -39,10 +38,6 @@ class DivKitView extends StatelessWidget { /// LTR or RTL mode. If null used auto. final TextDirection? textDirection; - /// [NOT_USED_FOR_SVG] Cache manager to override DefaultCacheManager if needed in DivImage. - @experimental - final BaseCacheManager? cacheManager; - /// [NOT_SUPPORTED_YET] Light or dark mode. If null used auto. @experimental final Brightness? brightness; @@ -87,7 +82,6 @@ class DivKitView extends StatelessWidget { this.actionHandler, this.customHandler, this.fontProvider, - this.cacheManager, this.brightness, this.textDirection, this.showUnsupportedDivs = false, @@ -110,16 +104,13 @@ class DivKitView extends StatelessWidget { ), child: provide( fontProvider ?? DivFontProvider.direct(), - child: provide( - cacheManager, - child: FocusScope( - child: _DivKitView( - data: data, - loadingBuilder: loadingBuilder, - variableStorage: variableStorage, - actionHandler: actionHandler, - customHandler: customHandler, - ), + child: FocusScope( + child: _DivKitView( + data: data, + loadingBuilder: loadingBuilder, + variableStorage: variableStorage, + actionHandler: actionHandler, + customHandler: customHandler, ), ), ), diff --git a/client/flutter/divkit/lib/src/core/expression/expression.dart b/client/flutter/divkit/lib/src/core/expression/expression.dart index 3fd517e07..75222465b 100644 --- a/client/flutter/divkit/lib/src/core/expression/expression.dart +++ b/client/flutter/divkit/lib/src/core/expression/expression.dart @@ -62,9 +62,12 @@ class ResolvableExpression extends Expression { Result? _executionTree; - ExpressionToken get executionTree => _executionTree!.isSuccess - ? _executionTree!.value - : throw _executionTree!.message; + ExpressionToken get executionTree { + if (_executionTree! is Success) { + return _executionTree!.value; + } + throw _executionTree!.message; + } Set? variables; diff --git a/client/flutter/divkit/lib/src/core/runtime/runtime.dart b/client/flutter/divkit/lib/src/core/runtime/runtime.dart index 06dd284b9..b42924dd3 100644 --- a/client/flutter/divkit/lib/src/core/runtime/runtime.dart +++ b/client/flutter/divkit/lib/src/core/runtime/runtime.dart @@ -2,7 +2,7 @@ import 'package:divkit/src/core/runtime/core.dart'; import 'package:divkit/src/core/runtime/entities.dart'; import 'package:divkit/src/core/runtime/functions/functions.dart'; import 'package:divkit/src/core/runtime/members.dart'; -import 'package:divkit/src/core/runtime/sync_runtime.dart'; +import 'package:divkit/src/core/runtime/runtime_sync.dart'; const runtime = SyncRuntime( functions: defaultFunctions, diff --git a/client/flutter/divkit/lib/src/core/runtime/sync_runtime.dart b/client/flutter/divkit/lib/src/core/runtime/runtime_sync.dart similarity index 100% rename from client/flutter/divkit/lib/src/core/runtime/sync_runtime.dart rename to client/flutter/divkit/lib/src/core/runtime/runtime_sync.dart diff --git a/client/flutter/divkit/lib/src/core/variable/variable_storage.dart b/client/flutter/divkit/lib/src/core/variable/variable_storage.dart index e2acf3bef..7c5ea5abe 100644 --- a/client/flutter/divkit/lib/src/core/variable/variable_storage.dart +++ b/client/flutter/divkit/lib/src/core/variable/variable_storage.dart @@ -28,8 +28,9 @@ class DefaultDivVariableStorage extends DivVariableStorage with EquatableMixin { inheritedStorage?.names.contains(variable.name) ?? false; if (isLocal) { - _storage - .add(Map.of(_storage.value)..update(variable.name, (_) => variable)); + _storage.add( + Map.of(_storage.value)..update(variable.name, (_) => variable), + ); } else if (isInherited) { inheritedStorage?.update(variable); } @@ -61,8 +62,7 @@ class DefaultDivVariableStorage extends DivVariableStorage with EquatableMixin { if (_contextStreamSubject == null) { final inheritedStream = inheritedStorage?.stream; if (inheritedStream != null) { - _contextStreamSubject = - BehaviorSubject>(); + _contextStreamSubject = BehaviorSubject(); _contextStreamSubscription ??= CombineLatestStream.combine2( inheritedStream, _storage.stream, diff --git a/client/flutter/divkit/lib/src/core/widgets/image/div_image_widget.dart b/client/flutter/divkit/lib/src/core/widgets/image/div_image_widget.dart index 58eb47dd2..1bcfdab6b 100644 --- a/client/flutter/divkit/lib/src/core/widgets/image/div_image_widget.dart +++ b/client/flutter/divkit/lib/src/core/widgets/image/div_image_widget.dart @@ -7,9 +7,7 @@ import 'dart:ui'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:divkit/divkit.dart'; import 'package:divkit/src/core/widgets/image/div_image_model.dart'; -import 'package:divkit/src/utils/provider.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:flutter_svg/svg.dart'; class DivImageWidget extends StatefulWidget { @@ -116,7 +114,6 @@ class _DivImageWidgetState extends State { alignment: model.contentAlignment.resolve( Directionality.maybeOf(context), ), - cacheManager: watch(context), ); } } diff --git a/client/flutter/divkit/lib/src/core/widgets/state/div_state_model.dart b/client/flutter/divkit/lib/src/core/widgets/state/div_state_model.dart index 3ae059c6b..171d287d1 100644 --- a/client/flutter/divkit/lib/src/core/widgets/state/div_state_model.dart +++ b/client/flutter/divkit/lib/src/core/widgets/state/div_state_model.dart @@ -37,8 +37,8 @@ class DivStateModel with EquatableMixin { divId = data.divId ?? data.id ?? ''; } - final state = read(context)!.stateManager; - state.registerState(divId); + final state = read(context)!.stateManager + ..registerState(divId); return DivStateModel( divId: divId, diff --git a/client/flutter/divkit/pubspec.yaml b/client/flutter/divkit/pubspec.yaml index 332b0326e..204d5f196 100644 --- a/client/flutter/divkit/pubspec.yaml +++ b/client/flutter/divkit/pubspec.yaml @@ -22,7 +22,6 @@ dependencies: visibility_detector: ">=0.2.0 <0.5.0" cached_network_image: ^3.2.3 - flutter_cache_manager: ^3.3.1 flutter_svg: ">=1.0.0 <3.0.0" dev_dependencies: