From d49004c8539e5dd65dea27a69a71d98df1c68752 Mon Sep 17 00:00:00 2001 From: Takuro KAKOI Date: Wed, 22 Sep 2021 17:29:12 +0900 Subject: [PATCH 01/15] migrate --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 23 +-- .../contents.xcworkspacedata | 2 +- example/pubspec.lock | 40 ++--- example/pubspec.yaml | 4 +- lib/details.dart | 14 +- lib/gesture_dectetor.dart | 36 ++--- lib/optimized_gesture_detector.dart | 133 ++++++++-------- lib/scale.dart | 150 +++++++++--------- lib/utils.dart | 2 +- pubspec.lock | 38 ++--- pubspec.yaml | 2 +- 12 files changed, 216 insertions(+), 230 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9367d48..8d4492f 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 72648f3..34ef170 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -9,11 +9,7 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -27,8 +23,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -39,13 +33,11 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -58,8 +50,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -69,9 +59,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -203,7 +191,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -255,7 +243,6 @@ /* Begin XCBuildConfiguration section */ 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -293,7 +280,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -329,7 +316,6 @@ }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -373,7 +359,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -383,7 +369,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -421,7 +406,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a1..919434a 100644 --- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/example/pubspec.lock b/example/pubspec.lock index b1801b2..8c9ab9b 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,56 +7,56 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety" + version: "2.8.1" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.2" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.3.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.2" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "1.0.3" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -73,14 +73,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.7.0" optimized_gesture_detector: dependency: "direct main" description: @@ -94,7 +94,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -106,56 +106,56 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety" + version: "0.4.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.2" + version: "2.1.0" sdks: - dart: ">=2.10.0-0.0.dev <2.10.0" + dart: ">=2.12.0 <3.0.0" flutter: ">1.21.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 072a683..d78f5ec 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,7 +14,7 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: @@ -24,7 +24,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.3 dev_dependencies: flutter_test: diff --git a/lib/details.dart b/lib/details.dart index 1df0987..ec3c299 100644 --- a/lib/details.dart +++ b/lib/details.dart @@ -2,7 +2,7 @@ import 'package:flutter/gestures.dart'; import 'package:optimized_gesture_detector/direction.dart'; class OpsMoveStartDetails { - OpsMoveStartDetails({this.globalPoint = Offset.zero, Offset localPoint}) + OpsMoveStartDetails({this.globalPoint = Offset.zero, Offset? localPoint}) : localPoint = localPoint ?? globalPoint; final Offset localPoint; @@ -10,7 +10,7 @@ class OpsMoveStartDetails { } class OpsMoveUpdateDetails { - OpsMoveUpdateDetails({this.globalPoint = Offset.zero, Offset localPoint}) + OpsMoveUpdateDetails({this.globalPoint = Offset.zero, Offset? localPoint}) : localPoint = localPoint ?? globalPoint; final Offset localPoint; @@ -21,7 +21,7 @@ class OpsMoveEndDetails { OpsMoveEndDetails( {this.velocity = Velocity.zero, this.globalPoint = Offset.zero, - Offset localPoint}) + Offset? localPoint}) : localPoint = localPoint ?? globalPoint; final Velocity velocity; @@ -30,7 +30,7 @@ class OpsMoveEndDetails { } class OpsScaleStartDetails { - OpsScaleStartDetails({this.globalPoint = Offset.zero, Offset localPoint}) + OpsScaleStartDetails({this.globalPoint = Offset.zero, Offset? localPoint}) : localPoint = localPoint ?? globalPoint; final Offset localPoint; @@ -40,8 +40,8 @@ class OpsScaleStartDetails { class OpsScaleUpdateDetails { OpsScaleUpdateDetails( {this.globalFocalPoint = Offset.zero, - Offset localFocalPoint, - Direction mainDirection, + Offset? localFocalPoint, + Direction? mainDirection, this.scale = 1.0, this.horizontalScale = 1.0, this.verticalScale = 1.0, @@ -62,7 +62,7 @@ class OpsScaleEndDetails { OpsScaleEndDetails( {this.velocity = Velocity.zero, this.globalPoint = Offset.zero, - Offset localPoint}) + Offset? localPoint}) : localPoint = localPoint ?? globalPoint; final Velocity velocity; diff --git a/lib/gesture_dectetor.dart b/lib/gesture_dectetor.dart index 1eabd44..c137e35 100644 --- a/lib/gesture_dectetor.dart +++ b/lib/gesture_dectetor.dart @@ -5,7 +5,7 @@ import 'package:optimized_gesture_detector/scale.dart' as scale; class CoreGestureDetector extends StatelessWidget { CoreGestureDetector( - {Key key, + {Key? key, this.child, this.onTapDown, this.onTapUp, @@ -28,19 +28,19 @@ class CoreGestureDetector extends StatelessWidget { /// The widget below this widget in the tree. /// /// {@macro flutter.widgets.child} - final Widget child; + final Widget? child; - final GestureTapDownCallback onTapDown; - final GestureTapUpCallback onTapUp; - final GestureTapCancelCallback onTapCancel; + final GestureTapDownCallback? onTapDown; + final GestureTapUpCallback? onTapUp; + final GestureTapCancelCallback? onTapCancel; - final GestureLongPressStartCallback onLongPressStart; - final GestureLongPressMoveUpdateCallback onLongPressMoveUpdate; - final GestureLongPressEndCallback onLongPressEnd; + final GestureLongPressStartCallback? onLongPressStart; + final GestureLongPressMoveUpdateCallback? onLongPressMoveUpdate; + final GestureLongPressEndCallback? onLongPressEnd; - final scale.GestureScaleStartCallback onScaleStart; - final scale.GestureScaleUpdateCallback onScaleUpdate; - final scale.GestureScaleEndCallback onScaleEnd; + final scale.GestureScaleStartCallback? onScaleStart; + final scale.GestureScaleUpdateCallback? onScaleUpdate; + final scale.GestureScaleEndCallback? onScaleEnd; // /// The pointer is in contact with the screen and has pressed with sufficient // /// force to initiate a force press. The amount of force is at least @@ -77,7 +77,7 @@ class CoreGestureDetector extends StatelessWidget { /// /// This defaults to [HitTestBehavior.deferToChild] if [child] is not null and /// [HitTestBehavior.translucent] if child is null. - final HitTestBehavior behavior; + final HitTestBehavior? behavior; /// Whether to exclude these gestures from the semantics tree. For /// example, the long-press gesture for showing a tooltip is @@ -109,8 +109,8 @@ class CoreGestureDetector extends StatelessWidget { final GestureArenaTeam _team = GestureArenaTeam(); - final CanDragDownFunction canHDragDown; - final CanDragDownFunction canVDragDown; + final CanDragDownFunction? canHDragDown; + final CanDragDownFunction? canVDragDown; @override Widget build(BuildContext context) { @@ -202,16 +202,16 @@ class CoreGestureDetector extends StatelessWidget { ); } - GestureDragDownCallback _gestureVDragDownCallback() { + GestureDragDownCallback? _gestureVDragDownCallback() { if (canVDragDown == null) return null; - return canVDragDown() ? (e) {} : null; + return canVDragDown!() ? (e) {} : null; } - GestureDragDownCallback _gestureHDragDownCallback() { + GestureDragDownCallback? _gestureHDragDownCallback() { if (canHDragDown == null) return null; - return canHDragDown() ? (e) {} : null; + return canHDragDown!() ? (e) {} : null; } @override diff --git a/lib/optimized_gesture_detector.dart b/lib/optimized_gesture_detector.dart index 04cec6c..03c0d9a 100644 --- a/lib/optimized_gesture_detector.dart +++ b/lib/optimized_gesture_detector.dart @@ -19,68 +19,69 @@ class OptimizedGestureDetector extends StatelessWidget { static const Offset ZERO = Offset(0, 0); - final OpsTapDownCallback _tapDownCallback; - final OpsSingleTapUpCallback _singleTapCallback; - final OpsDoubleTapUpCallback _doubleTapCallback; - final OpsDragStartCallback _dragStartCallback; - final OpsDragUpdateCallback _dragUpdateCallback; - final OpsDragEndCallback _dragEndCallback; - final OpsMoveStartCallback _moveStartCallback; - final OpsMoveUpdateCallback _moveUpdateCallback; - final OpsMoveEndCallback _moveEndCallback; - final OpsScaleStartCallback _scaleStartCallback; - final OpsScaleUpdateCallback _scaleUpdateCallback; - final OpsScaleEndCallback _scaleEndCallback; - - final OpsTapCancelCallback _tapCancelCallback; - final OpsMoveCancelCallback _moveCancelCallback; - final OpsScaleCancelCallback _scaleCancelCallback; + final OpsTapDownCallback? _tapDownCallback; + final OpsSingleTapUpCallback? _singleTapCallback; + final OpsDoubleTapUpCallback? _doubleTapCallback; + final OpsDragStartCallback? _dragStartCallback; + final OpsDragUpdateCallback? _dragUpdateCallback; + final OpsDragEndCallback? _dragEndCallback; + final OpsMoveStartCallback? _moveStartCallback; + final OpsMoveUpdateCallback? _moveUpdateCallback; + final OpsMoveEndCallback? _moveEndCallback; + final OpsScaleStartCallback? _scaleStartCallback; + final OpsScaleUpdateCallback? _scaleUpdateCallback; + final OpsScaleEndCallback? _scaleEndCallback; + + final OpsTapCancelCallback? _tapCancelCallback; + final OpsMoveCancelCallback? _moveCancelCallback; + final OpsScaleCancelCallback? _scaleCancelCallback; int _tapDownTime = INITIAL_INT_VALUE; bool _isSingleTap = false; bool _isDoubleTap = false; - bool _isRealScale; + bool? _isRealScale; bool _isMoveCancel = false; bool _isScaleCancel = false; - Timer _singleTapTimer; + Timer? _singleTapTimer; - Direction _scaleMainDirection; + Direction? _scaleMainDirection; - Offset _lastMoveUpdateGolbalPos; - Offset _lastMoveUpdateLocalPos; + Offset? _lastMoveUpdateGolbalPos; + Offset? _lastMoveUpdateLocalPos; - Offset _lastScaleUpdateGolbalPos; - Offset _lastScaleUpdateLocalPos; + Offset? _lastScaleUpdateGolbalPos; + Offset? _lastScaleUpdateLocalPos; - List _scaleTwoKeys = List(); + // ignore: deprecated_member_use + List _scaleTwoKeys = List.empty(); - final Widget child; + final Widget? child; - final gd.CanDragDownFunction _canHDragDown; - final gd.CanDragDownFunction _canVDragDown; + final gd.CanDragDownFunction? _canHDragDown; + final gd.CanDragDownFunction? _canVDragDown; OptimizedGestureDetector( - {Key key, - OpsTapDownCallback tapDown, - OpsSingleTapUpCallback singleTapUp, - OpsTapCancelCallback tapCancel, - OpsDoubleTapUpCallback doubleTapUp, - OpsDragStartCallback dragStart, - OpsDragUpdateCallback dragUpdate, - OpsDragEndCallback dragEnd, - OpsMoveStartCallback moveStart, - OpsMoveCancelCallback moveCancel, - OpsMoveUpdateCallback moveUpdate, - OpsMoveEndCallback moveEnd, - OpsScaleStartCallback scaleStart, - OpsScaleCancelCallback scaleCancel, - OpsScaleUpdateCallback scaleUpdate, - OpsScaleEndCallback scaleEnd, - gd.CanDragDownFunction needHorizontalConflictFunc, - gd.CanDragDownFunction needVerticalConflictFunc, + {Key? key, + OpsTapDownCallback? tapDown, + OpsSingleTapUpCallback? singleTapUp, + OpsTapCancelCallback? tapCancel, + OpsDoubleTapUpCallback? doubleTapUp, + OpsDragStartCallback? dragStart, + OpsDragUpdateCallback? dragUpdate, + OpsDragEndCallback? dragEnd, + OpsMoveStartCallback? moveStart, + OpsMoveCancelCallback? moveCancel, + OpsMoveUpdateCallback? moveUpdate, + OpsMoveEndCallback? moveEnd, + OpsScaleStartCallback? scaleStart, + OpsScaleCancelCallback? scaleCancel, + OpsScaleUpdateCallback? scaleUpdate, + OpsScaleEndCallback? scaleEnd, + gd.CanDragDownFunction? needHorizontalConflictFunc, + gd.CanDragDownFunction? needVerticalConflictFunc, this.child}) : _tapDownCallback = tapDown, _tapCancelCallback = tapCancel, @@ -126,7 +127,7 @@ class OptimizedGestureDetector extends StatelessWidget { } if (_tapDownCallback != null) { - _tapDownCallback(details); + _tapDownCallback!(details); } }, onTapUp: (details) { @@ -157,7 +158,7 @@ class OptimizedGestureDetector extends StatelessWidget { _isDoubleTap = false; _cancelAndResetSingleTapTimer(); if (_tapCancelCallback != null) { - _tapCancelCallback(); + _tapCancelCallback!(); } }, onLongPressStart: (details) { @@ -187,14 +188,14 @@ class OptimizedGestureDetector extends StatelessWidget { _isRealScale = !(details.verticalScale == 1.0 && details.horizontalScale == 1.0 && details.rotation == 0.0); - if (_isRealScale) { + if (_isRealScale!) { _moveCancel(); } else { _scaleCancel(); } } - if (_isRealScale) { + if (_isRealScale!) { _scaleUpdate(details); } else { _moveUpdate(details); @@ -218,14 +219,14 @@ class OptimizedGestureDetector extends StatelessWidget { void _singleTap(TapUpDetails details) { Util.L1("_singleTap", details); if (_singleTapCallback != null) { - _singleTapCallback(details); + _singleTapCallback!(details); } } void _doubleTap(TapUpDetails details) { Util.L1("_doubleTap", details); if (_doubleTapCallback != null) { - _doubleTapCallback(details); + _doubleTapCallback!(details); } } @@ -233,21 +234,21 @@ class OptimizedGestureDetector extends StatelessWidget { void _dragStart(LongPressStartDetails details) { Util.L1("_dragStart", details); if (_dragStartCallback != null) { - _dragStartCallback(details); + _dragStartCallback!(details); } } void _dragUpdate(LongPressMoveUpdateDetails details) { Util.L1("_dragUpdate", details); if (_dragUpdateCallback != null) { - _dragUpdateCallback(details); + _dragUpdateCallback!(details); } } void _dragEnd(LongPressEndDetails details) { Util.L1("_dragEnd", details); if (_dragEndCallback != null) { - _dragEndCallback(details); + _dragEndCallback!(details); } } @@ -256,14 +257,14 @@ class OptimizedGestureDetector extends StatelessWidget { Util.L1("_moveStart", details); _resetLastMoveUpdatePos(); if (_moveStartCallback != null) { - _moveStartCallback(DetailsUtils.toOpsMoveStartDetails(details)); + _moveStartCallback!(DetailsUtils.toOpsMoveStartDetails(details)); } } void _moveUpdate(scale.OpsSUpdateDetails details) { Util.L1("_moveUpdate", details); if (_moveUpdateCallback != null) { - _moveUpdateCallback(DetailsUtils.toOpsMoveUpdateDetails(details)); + _moveUpdateCallback!(DetailsUtils.toOpsMoveUpdateDetails(details)); } _lastMoveUpdateGolbalPos = details.focalPoint; _lastMoveUpdateLocalPos = details.localFocalPoint; @@ -272,7 +273,7 @@ class OptimizedGestureDetector extends StatelessWidget { void _moveEnd(scale.OpsSEndDetails details) { Util.L1("_moveEnd", details); if (_moveEndCallback != null) { - _moveEndCallback(DetailsUtils.toOpsMoveEndDetails(details, + _moveEndCallback!(DetailsUtils.toOpsMoveEndDetails(details, _lastMoveUpdateGolbalPos ?? ZERO, _lastMoveUpdateLocalPos ?? ZERO)); } _resetLastMoveUpdatePos(); @@ -283,7 +284,7 @@ class OptimizedGestureDetector extends StatelessWidget { _isMoveCancel = true; _resetLastMoveUpdatePos(); if (_moveCancelCallback != null) { - _moveCancelCallback(); + _moveCancelCallback!(); } } @@ -293,16 +294,16 @@ class OptimizedGestureDetector extends StatelessWidget { _resetScaleDirection(); _resetLastScaleUpdatePos(); if (_scaleStartCallback != null) { - _scaleStartCallback(DetailsUtils.toOpsScaleStartDetails(details)); + _scaleStartCallback!(DetailsUtils.toOpsScaleStartDetails(details)); } } void _scaleUpdate(scale.OpsSUpdateDetails details) { Util.L1("_scaleUpdate", details); - if (details.globalPointerLocations.length >= 2) { + if (details.globalPointerLocations!.length >= 2) { if (_scaleTwoKeys.isEmpty) { - details.globalPointerLocations.forEach((k, v) { + details.globalPointerLocations!.forEach((k, v) { if (_scaleTwoKeys.length < 2) { _scaleTwoKeys.add(k); } @@ -312,13 +313,13 @@ class OptimizedGestureDetector extends StatelessWidget { if (_scaleTwoKeys.length >= 2) { if (_scaleMainDirection == null) { _scaleMainDirection = getCurrentDirection( - details.globalPointerLocations[_scaleTwoKeys[0]], - details.globalPointerLocations[_scaleTwoKeys[1]]); + details.globalPointerLocations![_scaleTwoKeys[0]]!, + details.globalPointerLocations![_scaleTwoKeys[1]]!); } Util.L2("direction $_scaleMainDirection"); if (_scaleUpdateCallback != null) { - _scaleUpdateCallback(DetailsUtils.toOpsScaleUpdateDetails( + _scaleUpdateCallback!(DetailsUtils.toOpsScaleUpdateDetails( details, _scaleMainDirection)); } } @@ -331,7 +332,7 @@ class OptimizedGestureDetector extends StatelessWidget { Util.L1("_scaleEnd", details); _resetScaleDirection(); if (_scaleEndCallback != null) { - _scaleEndCallback(DetailsUtils.toOpsScaleEndDetails(details, + _scaleEndCallback!(DetailsUtils.toOpsScaleEndDetails(details, _lastScaleUpdateGolbalPos ?? ZERO, _lastScaleUpdateLocalPos ?? ZERO)); } _resetLastScaleUpdatePos(); @@ -343,7 +344,7 @@ class OptimizedGestureDetector extends StatelessWidget { _resetScaleDirection(); _resetLastScaleUpdatePos(); if (_scaleCancelCallback != null) { - _scaleCancelCallback(); + _scaleCancelCallback!(); } } diff --git a/lib/scale.dart b/lib/scale.dart index dc25087..740a0af 100644 --- a/lib/scale.dart +++ b/lib/scale.dart @@ -42,12 +42,12 @@ class OpsSStartDetails { this.globalPointerLocations, this.localPointerLocations, this.focalPoint = Offset.zero, - Offset localFocalPoint, + Offset? localFocalPoint, }) : assert(focalPoint != null), localFocalPoint = localFocalPoint ?? focalPoint; - final Map globalPointerLocations; - final Map localPointerLocations; + final Map? globalPointerLocations; + final Map? localPointerLocations; final Offset focalPoint; final Offset localFocalPoint; @@ -67,7 +67,7 @@ class OpsSUpdateDetails { this.globalPointerLocations, this.localPointerLocations, this.focalPoint = Offset.zero, - Offset localFocalPoint, + Offset? localFocalPoint, this.scale = 1.0, this.horizontalScale = 1.0, this.verticalScale = 1.0, @@ -79,8 +79,8 @@ class OpsSUpdateDetails { assert(rotation != null), localFocalPoint = localFocalPoint ?? focalPoint; - final Map globalPointerLocations; - final Map localPointerLocations; + final Map? globalPointerLocations; + final Map? localPointerLocations; final Offset focalPoint; final Offset localFocalPoint; final double scale; @@ -104,8 +104,8 @@ class OpsSEndDetails { this.velocity = Velocity.zero}) : assert(velocity != null); - final Map globalPointerLocations; - final Map localPointerLocations; + final Map? globalPointerLocations; + final Map? localPointerLocations; /// The velocity of the last pointer to be lifted off of the screen. final Velocity velocity; @@ -139,11 +139,11 @@ class _LineBetweenPointers { assert(pointerStartId != pointerEndId); // The location and the id of the pointer that marks the start of the line. - final Offset pointerStartLocation; + final Offset? pointerStartLocation; final int pointerStartId; // The location and the id of the pointer that marks the end of the line. - final Offset pointerEndLocation; + final Offset? pointerEndLocation; final int pointerEndId; } @@ -159,63 +159,63 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { /// /// {@macro flutter.gestures.gestureRecognizer.kind} OpsScaleGestureRecognizer({ - Object debugOwner, - PointerDeviceKind kind, + Object? debugOwner, + PointerDeviceKind? kind, }) : super(debugOwner: debugOwner, kind: kind); /// The pointers in contact with the screen have established a focal point and /// initial scale of 1.0. - GestureScaleStartCallback onStart; + GestureScaleStartCallback? onStart; /// The pointers in contact with the screen have indicated a new focal point /// and/or scale. - GestureScaleUpdateCallback onUpdate; + GestureScaleUpdateCallback? onUpdate; /// The pointers are no longer in contact with the screen. - GestureScaleEndCallback onEnd; + GestureScaleEndCallback? onEnd; _ScaleState _state = _ScaleState.ready; - Matrix4 _lastTransform; - - Offset _initialFocalPoint; - Offset _currentFocalPoint; - double _initialSpan; - double _currentSpan; - double _initialHorizontalSpan; - double _currentHorizontalSpan; - double _initialVerticalSpan; - double _currentVerticalSpan; - _LineBetweenPointers _initialLine; - _LineBetweenPointers _currentLine; - Map _pointerLocations; - List _pointerQueue; // A queue to sort pointers in order of entrance + Matrix4? _lastTransform; + + Offset? _initialFocalPoint; + Offset? _currentFocalPoint; + double? _initialSpan; + double? _currentSpan; + double? _initialHorizontalSpan; + double? _currentHorizontalSpan; + double? _initialVerticalSpan; + double? _currentVerticalSpan; + _LineBetweenPointers? _initialLine; + _LineBetweenPointers? _currentLine; + Map? _pointerLocations; + late List _pointerQueue; // A queue to sort pointers in order of entrance final Map _velocityTrackers = {}; double get _scaleFactor => - _initialSpan > 0.0 ? _currentSpan / _initialSpan : 1.0; + _initialSpan! > 0.0 ? _currentSpan! / _initialSpan! : 1.0; - double get _horizontalScaleFactor => _initialHorizontalSpan > 0.0 - ? _currentHorizontalSpan / _initialHorizontalSpan + double get _horizontalScaleFactor => _initialHorizontalSpan! > 0.0 + ? _currentHorizontalSpan! / _initialHorizontalSpan! : 1.0; - double get _verticalScaleFactor => _initialVerticalSpan > 0.0 - ? _currentVerticalSpan / _initialVerticalSpan + double get _verticalScaleFactor => _initialVerticalSpan! > 0.0 + ? _currentVerticalSpan! / _initialVerticalSpan! : 1.0; double _computeRotationFactor() { if (_initialLine == null || _currentLine == null) { return 0.0; } - final double fx = _initialLine.pointerStartLocation.dx; - final double fy = _initialLine.pointerStartLocation.dy; - final double sx = _initialLine.pointerEndLocation.dx; - final double sy = _initialLine.pointerEndLocation.dy; + final double fx = _initialLine!.pointerStartLocation!.dx; + final double fy = _initialLine!.pointerStartLocation!.dy; + final double sx = _initialLine!.pointerEndLocation!.dx; + final double sy = _initialLine!.pointerEndLocation!.dy; - final double nfx = _currentLine.pointerStartLocation.dx; - final double nfy = _currentLine.pointerStartLocation.dy; - final double nsx = _currentLine.pointerEndLocation.dx; - final double nsy = _currentLine.pointerEndLocation.dy; + final double nfx = _currentLine!.pointerStartLocation!.dx; + final double nfy = _currentLine!.pointerStartLocation!.dy; + final double nsx = _currentLine!.pointerEndLocation!.dx; + final double nsy = _currentLine!.pointerEndLocation!.dy; final double angle1 = math.atan2(fy - sy, fx - sx); final double angle2 = math.atan2(nfy - nsy, nfx - nsx); @@ -246,21 +246,21 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { bool didChangeConfiguration = false; bool shouldStartIfAccepted = false; if (event is PointerMoveEvent) { - final VelocityTracker tracker = _velocityTrackers[event.pointer]; + final VelocityTracker tracker = _velocityTrackers[event.pointer]!; assert(tracker != null); if (!event.synthesized) tracker.addPosition(event.timeStamp, event.position); - _pointerLocations[event.pointer] = event.position; + _pointerLocations![event.pointer] = event.position; shouldStartIfAccepted = true; _lastTransform = event.transform; } else if (event is PointerDownEvent) { - _pointerLocations[event.pointer] = event.position; + _pointerLocations![event.pointer] = event.position; _pointerQueue.add(event.pointer); didChangeConfiguration = true; shouldStartIfAccepted = true; _lastTransform = event.transform; } else if (event is PointerUpEvent || event is PointerCancelEvent) { - _pointerLocations.remove(event.pointer); + _pointerLocations!.remove(event.pointer); _pointerQueue.remove(event.pointer); didChangeConfiguration = true; _lastTransform = event.transform; @@ -275,12 +275,12 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { } void _update() { - final int count = _pointerLocations.keys.length; + final int count = _pointerLocations!.keys.length; // Compute the focal point Offset focalPoint = Offset.zero; - for (int pointer in _pointerLocations.keys) { - focalPoint += _pointerLocations[pointer]; + for (int pointer in _pointerLocations!.keys) { + focalPoint += _pointerLocations![pointer]!; } _currentFocalPoint = count > 0 ? focalPoint / count.toDouble() : Offset.zero; @@ -291,13 +291,13 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { double totalDeviation = 0.0; double totalHorizontalDeviation = 0.0; double totalVerticalDeviation = 0.0; - for (int pointer in _pointerLocations.keys) { + for (int pointer in _pointerLocations!.keys) { totalDeviation += - (_currentFocalPoint - _pointerLocations[pointer]).distance; + (_currentFocalPoint! - _pointerLocations![pointer]!).distance; totalHorizontalDeviation += - (_currentFocalPoint.dx - _pointerLocations[pointer].dx).abs(); + (_currentFocalPoint!.dx - _pointerLocations![pointer]!.dx).abs(); totalVerticalDeviation += - (_currentFocalPoint.dy - _pointerLocations[pointer].dy).abs(); + (_currentFocalPoint!.dy - _pointerLocations![pointer]!.dy).abs(); } _currentSpan = count > 0 ? totalDeviation / count : 0.0; _currentHorizontalSpan = count > 0 ? totalHorizontalDeviation / count : 0.0; @@ -307,29 +307,29 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { /// Updates [_initialLine] and [_currentLine] accordingly to the situation of /// the registered pointers void _updateLines() { - final int count = _pointerLocations.keys.length; + final int count = _pointerLocations!.keys.length; assert(_pointerQueue.length >= count); /// In case of just one pointer registered, reconfigure [_initialLine] if (count < 2) { _initialLine = _currentLine; } else if (_initialLine != null && - _initialLine.pointerStartId == _pointerQueue[0] && - _initialLine.pointerEndId == _pointerQueue[1]) { + _initialLine!.pointerStartId == _pointerQueue[0] && + _initialLine!.pointerEndId == _pointerQueue[1]) { /// Rotation updated, set the [_currentLine] _currentLine = _LineBetweenPointers( pointerStartId: _pointerQueue[0], - pointerStartLocation: _pointerLocations[_pointerQueue[0]], + pointerStartLocation: _pointerLocations![_pointerQueue[0]], pointerEndId: _pointerQueue[1], - pointerEndLocation: _pointerLocations[_pointerQueue[1]], + pointerEndLocation: _pointerLocations![_pointerQueue[1]], ); } else { /// A new rotation process is on the way, set the [_initialLine] _initialLine = _LineBetweenPointers( pointerStartId: _pointerQueue[0], - pointerStartLocation: _pointerLocations[_pointerQueue[0]], + pointerStartLocation: _pointerLocations![_pointerQueue[0]], pointerEndId: _pointerQueue[1], - pointerEndLocation: _pointerLocations[_pointerQueue[1]], + pointerEndLocation: _pointerLocations![_pointerQueue[1]], ); _currentLine = null; } @@ -343,7 +343,7 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { _initialVerticalSpan = _currentVerticalSpan; if (_state == _ScaleState.started) { if (onEnd != null) { - final VelocityTracker tracker = _velocityTrackers[pointer]; + final VelocityTracker tracker = _velocityTrackers[pointer]!; assert(tracker != null); Velocity velocity = tracker.getVelocity(); @@ -356,16 +356,16 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { kMaxFlingVelocity); invokeCallback( 'onEnd', - () => onEnd(OpsSEndDetails( + () => onEnd!(OpsSEndDetails( globalPointerLocations: _pointerLocations, - localPointerLocations: toLocalLocations(_pointerLocations), + localPointerLocations: toLocalLocations(_pointerLocations!), velocity: velocity))); } else { invokeCallback( 'onEnd', - () => onEnd(OpsSEndDetails( + () => onEnd!(OpsSEndDetails( globalPointerLocations: _pointerLocations, - localPointerLocations: toLocalLocations(_pointerLocations), + localPointerLocations: toLocalLocations(_pointerLocations!), velocity: Velocity.zero))); } } @@ -379,9 +379,9 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { if (_state == _ScaleState.ready) _state = _ScaleState.possible; if (_state == _ScaleState.possible) { - final double spanDelta = (_currentSpan - _initialSpan).abs(); + final double spanDelta = (_currentSpan! - _initialSpan!).abs(); final double focalPointDelta = - (_currentFocalPoint - _initialFocalPoint).distance; + (_currentFocalPoint! - _initialFocalPoint!).distance; if (spanDelta > kScaleSlop || focalPointDelta > kPanSlop) resolve(GestureDisposition.accepted); } else if (_state.index >= _ScaleState.accepted.index) { @@ -395,15 +395,15 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { if (_state == _ScaleState.started && onUpdate != null) invokeCallback('onUpdate', () { - onUpdate(OpsSUpdateDetails( + onUpdate!(OpsSUpdateDetails( globalPointerLocations: _pointerLocations, - localPointerLocations: toLocalLocations(_pointerLocations), + localPointerLocations: toLocalLocations(_pointerLocations!), scale: _scaleFactor, horizontalScale: _horizontalScaleFactor, verticalScale: _verticalScaleFactor, - focalPoint: _currentFocalPoint, + focalPoint: _currentFocalPoint!, localFocalPoint: PointerEvent.transformPosition( - _lastTransform, _currentFocalPoint), + _lastTransform, _currentFocalPoint!), rotation: _computeRotationFactor(), )); }); @@ -413,12 +413,12 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { assert(_state == _ScaleState.started); if (onStart != null) invokeCallback('onStart', () { - onStart(OpsSStartDetails( + onStart!(OpsSStartDetails( globalPointerLocations: _pointerLocations, - localPointerLocations: toLocalLocations(_pointerLocations), - focalPoint: _currentFocalPoint, + localPointerLocations: toLocalLocations(_pointerLocations!), + focalPoint: _currentFocalPoint!, localFocalPoint: PointerEvent.transformPosition( - _lastTransform, _currentFocalPoint), + _lastTransform, _currentFocalPoint!), )); }); } diff --git a/lib/utils.dart b/lib/utils.dart index 8e20a75..857a6ad 100644 --- a/lib/utils.dart +++ b/lib/utils.dart @@ -28,7 +28,7 @@ class DetailsUtils { } static OpsScaleUpdateDetails toOpsScaleUpdateDetails( - OpsSUpdateDetails details, Direction mainDirection) { + OpsSUpdateDetails details, Direction? mainDirection) { return OpsScaleUpdateDetails( globalFocalPoint: details.focalPoint, localFocalPoint: details.localFocalPoint, diff --git a/pubspec.lock b/pubspec.lock index c84e218..06a03e4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,49 +7,49 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety" + version: "2.8.1" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.2" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.3.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.2" + version: "1.15.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -66,21 +66,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.7.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -92,56 +92,56 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety" + version: "0.4.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.2" + version: "2.1.0" sdks: - dart: ">=2.10.0-0.0.dev <2.10.0" + dart: ">=2.12.0 <3.0.0" flutter: ">1.21.0" diff --git a/pubspec.yaml b/pubspec.yaml index aa4ef47..0e78308 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ author: SunPointed<410338643@qq.com> homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: - sdk: ">=2.1.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' flutter: ">1.21.0" dependencies: From c068b2253dafb2cb927603074b97f0736dbf3421 Mon Sep 17 00:00:00 2001 From: Takuro KAKOI Date: Wed, 22 Sep 2021 17:33:25 +0900 Subject: [PATCH 02/15] update ggitignore --- example/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/example/.gitignore b/example/.gitignore index ac4a906..a5b6046 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -70,3 +70,5 @@ !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages + +**/ios/Flutter/flutter_export_environment.sh From 01f68c07d26f55ec9e5aced8b891fae91b2bf8fe Mon Sep 17 00:00:00 2001 From: Takuro KAKOI Date: Tue, 28 Sep 2021 20:41:22 +0900 Subject: [PATCH 03/15] bug fix --- lib/optimized_gesture_detector.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/optimized_gesture_detector.dart b/lib/optimized_gesture_detector.dart index 03c0d9a..4ad8e37 100644 --- a/lib/optimized_gesture_detector.dart +++ b/lib/optimized_gesture_detector.dart @@ -56,7 +56,7 @@ class OptimizedGestureDetector extends StatelessWidget { Offset? _lastScaleUpdateLocalPos; // ignore: deprecated_member_use - List _scaleTwoKeys = List.empty(); + List _scaleTwoKeys = []; final Widget? child; From 74ce99eaf662eeeb90e670aecd08df80a2cfed54 Mon Sep 17 00:00:00 2001 From: Absar Date: Sun, 6 Feb 2022 20:08:55 +0100 Subject: [PATCH 04/15] Null safety lint updates. Upgrade dependencies. Bump version. --- README.md | 3 ++- example/pubspec.lock | 16 ++++++++-------- example/pubspec.yaml | 2 +- lib/gesture_dectetor.dart | 4 +--- lib/scale.dart | 18 +++++------------- pubspec.lock | 12 ++++++------ pubspec.yaml | 2 +- 7 files changed, 24 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 3b72e21..26d1fba 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,10 @@ An optimized class on flutter GestureDetector. Flutter's GestureDetector has its **1.add dependencies** ``` dependencies: - optimized_gesture_detector: ^0.0.6 + optimized_gesture_detector: ^0.1.0 ``` ## Notes * Version 0.0.5 is for use with Flutter versions prior to 1.22.0 * Version 0.0.6 is for use with Flutter version 1.22.0 and newer. +* Version 0.1.0 Null safety version. \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 8c9ab9b..c5f4f80 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -49,7 +49,7 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" fake_async: dependency: transitive description: @@ -73,7 +73,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -87,7 +87,7 @@ packages: path: ".." relative: true source: path - version: "0.0.6" + version: "0.1.0" path: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" typed_data: dependency: transitive description: @@ -155,7 +155,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">1.21.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index d78f5ec..d9f209c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.3 + cupertino_icons: ^1.0.4 dev_dependencies: flutter_test: diff --git a/lib/gesture_dectetor.dart b/lib/gesture_dectetor.dart index c137e35..433843b 100644 --- a/lib/gesture_dectetor.dart +++ b/lib/gesture_dectetor.dart @@ -21,9 +21,7 @@ class CoreGestureDetector extends StatelessWidget { this.dragStartBehavior = DragStartBehavior.start, this.canHDragDown, this.canVDragDown}) - : assert(excludeFromSemantics != null), - assert(dragStartBehavior != null), - super(key: key); + : super(key: key); /// The widget below this widget in the tree. /// diff --git a/lib/scale.dart b/lib/scale.dart index 740a0af..6c41186 100644 --- a/lib/scale.dart +++ b/lib/scale.dart @@ -43,8 +43,7 @@ class OpsSStartDetails { this.localPointerLocations, this.focalPoint = Offset.zero, Offset? localFocalPoint, - }) : assert(focalPoint != null), - localFocalPoint = localFocalPoint ?? focalPoint; + }) : localFocalPoint = localFocalPoint ?? focalPoint; final Map? globalPointerLocations; final Map? localPointerLocations; @@ -72,11 +71,9 @@ class OpsSUpdateDetails { this.horizontalScale = 1.0, this.verticalScale = 1.0, this.rotation = 0.0, - }) : assert(focalPoint != null), - assert(scale != null && scale >= 0.0), - assert(horizontalScale != null && horizontalScale >= 0.0), - assert(verticalScale != null && verticalScale >= 0.0), - assert(rotation != null), + }) : assert(scale >= 0.0), + assert(horizontalScale >= 0.0), + assert(verticalScale >= 0.0), localFocalPoint = localFocalPoint ?? focalPoint; final Map? globalPointerLocations; @@ -101,8 +98,7 @@ class OpsSEndDetails { OpsSEndDetails( {this.globalPointerLocations, this.localPointerLocations, - this.velocity = Velocity.zero}) - : assert(velocity != null); + this.velocity = Velocity.zero}); final Map? globalPointerLocations; final Map? localPointerLocations; @@ -116,7 +112,6 @@ class OpsSEndDetails { } bool _isFlingGesture(Velocity velocity) { - assert(velocity != null); final double speedSquared = velocity.pixelsPerSecond.distanceSquared; return speedSquared > kMinFlingVelocity * kMinFlingVelocity; } @@ -135,7 +130,6 @@ class _LineBetweenPointers { this.pointerEndLocation = Offset.zero, this.pointerEndId = 1, }) : assert(pointerStartLocation != null && pointerEndLocation != null), - assert(pointerStartId != null && pointerEndId != null), assert(pointerStartId != pointerEndId); // The location and the id of the pointer that marks the start of the line. @@ -247,7 +241,6 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { bool shouldStartIfAccepted = false; if (event is PointerMoveEvent) { final VelocityTracker tracker = _velocityTrackers[event.pointer]!; - assert(tracker != null); if (!event.synthesized) tracker.addPosition(event.timeStamp, event.position); _pointerLocations![event.pointer] = event.position; @@ -344,7 +337,6 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { if (_state == _ScaleState.started) { if (onEnd != null) { final VelocityTracker tracker = _velocityTrackers[pointer]!; - assert(tracker != null); Velocity velocity = tracker.getVelocity(); if (_isFlingGesture(velocity)) { diff --git a/pubspec.lock b/pubspec.lock index 06a03e4..27daff1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -66,7 +66,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -127,7 +127,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" typed_data: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">1.21.0" diff --git a/pubspec.yaml b/pubspec.yaml index 0e78308..83fef39 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: optimized_gesture_detector description: a optimized class on flutter GestureDector -version: 0.0.6 +version: 0.1.0 author: SunPointed<410338643@qq.com> homepage: https://github.com/SunPointed/OptimizedGestureDetector From a34523b1dd86768c3f48a0de8e62b093bc6c32a2 Mon Sep 17 00:00:00 2001 From: Absar Date: Mon, 16 May 2022 00:58:34 +0200 Subject: [PATCH 05/15] Flutter 3 fixes. --- CHANGELOG.md | 4 ++++ README.md | 5 +++-- example/pubspec.lock | 30 +++++++++++++++--------------- lib/scale.dart | 4 ++-- pubspec.lock | 28 ++++++++++++++-------------- pubspec.yaml | 2 +- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c0a824..d967ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [0.1.1] - 20220516 +* Flutter 3 fixes +## [0.1.0] - 20220206 +* Null safety version ## [0.0.6] - 20200918 * Update to Flutter breaking change, VelocityTracker now takes an argument. * Removed unused import. diff --git a/README.md b/README.md index 26d1fba..f31c1d1 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,11 @@ An optimized class on flutter GestureDetector. Flutter's GestureDetector has its **1.add dependencies** ``` dependencies: - optimized_gesture_detector: ^0.1.0 + optimized_gesture_detector: ^0.1.1 ``` ## Notes * Version 0.0.5 is for use with Flutter versions prior to 1.22.0 * Version 0.0.6 is for use with Flutter version 1.22.0 and newer. -* Version 0.1.0 Null safety version. \ No newline at end of file +* Version 0.1.0 Null safety version. +* Version 0.1.1 Flutter 3 fixes. \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index c5f4f80..9732735 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -74,6 +74,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: @@ -87,14 +94,14 @@ packages: path: ".." relative: true source: path - version: "0.1.0" + version: "0.1.1" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" sky_engine: dependency: transitive description: flutter @@ -106,7 +113,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -141,21 +148,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">1.21.0" diff --git a/lib/scale.dart b/lib/scale.dart index 6c41186..6465622 100644 --- a/lib/scale.dart +++ b/lib/scale.dart @@ -155,7 +155,7 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { OpsScaleGestureRecognizer({ Object? debugOwner, PointerDeviceKind? kind, - }) : super(debugOwner: debugOwner, kind: kind); + }) : super(debugOwner: debugOwner); /// The pointers in contact with the screen have established a focal point and /// initial scale of 1.0. @@ -220,7 +220,7 @@ class OpsScaleGestureRecognizer extends OneSequenceGestureRecognizer { @override void addAllowedPointer(PointerEvent event) { startTrackingPointer(event.pointer, event.transform); - _velocityTrackers[event.pointer] = VelocityTracker(event.kind); + _velocityTrackers[event.pointer] = VelocityTracker.withKind(event.kind); if (_state == _ScaleState.ready) { _state = _ScaleState.possible; _initialSpan = 0.0; diff --git a/pubspec.lock b/pubspec.lock index 27daff1..f001c06 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,14 +42,14 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -67,6 +67,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: @@ -80,7 +87,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" sky_engine: dependency: transitive description: flutter @@ -92,7 +99,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -127,21 +134,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">1.21.0" diff --git a/pubspec.yaml b/pubspec.yaml index 83fef39..0373773 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: optimized_gesture_detector description: a optimized class on flutter GestureDector -version: 0.1.0 +version: 0.1.1 author: SunPointed<410338643@qq.com> homepage: https://github.com/SunPointed/OptimizedGestureDetector From 13b80169db24a6a5076ace5bbb496d3e21f00fb2 Mon Sep 17 00:00:00 2001 From: Absar Date: Sun, 16 Oct 2022 19:28:19 +0200 Subject: [PATCH 06/15] Flutter 3.3 fixes * Upgrade dependencies cupertino_icons * Bump sdk from >=2.12.0 to >=2.17.0 * Bump flutter from >1.21.0 to flutter: >=3.0.0 --- CHANGELOG.md | 5 +++++ example/pubspec.lock | 39 ++++++++++++++++----------------------- example/pubspec.yaml | 4 ++-- pubspec.lock | 35 ++++++++++++++--------------------- pubspec.yaml | 7 +++---- 5 files changed, 40 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d967ece..daab94e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.0.0] - 20221016 +* Flutter 3.3 fixes +* Upgrade dependencies cupertino_icons +* Bump sdk from >=2.12.0 to >=2.17.0 +* Bump flutter from >1.21.0 to flutter: >=3.0.0 ## [0.1.1] - 20220516 * Flutter 3 fixes ## [0.1.0] - 20220206 diff --git a/example/pubspec.lock b/example/pubspec.lock index 9732735..487a148 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,21 +21,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: @@ -49,14 +42,14 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -73,35 +66,35 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" optimized_gesture_detector: dependency: "direct main" description: path: ".." relative: true source: path - version: "0.1.1" + version: "1.0.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -113,7 +106,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -134,21 +127,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" vector_math: dependency: transitive description: @@ -157,5 +150,5 @@ packages: source: hosted version: "2.1.2" sdks: - dart: ">=2.17.0-0 <3.0.0" - flutter: ">1.21.0" + dart: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index d9f209c..58adae1 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,7 +14,7 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.17.0 <3.0.0' dependencies: flutter: @@ -24,7 +24,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.4 + cupertino_icons: ^1.0.5 dev_dependencies: flutter_test: diff --git a/pubspec.lock b/pubspec.lock index f001c06..263df9e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,21 +21,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: @@ -49,7 +42,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -66,28 +59,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -99,7 +92,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -120,21 +113,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" vector_math: dependency: transitive description: @@ -143,5 +136,5 @@ packages: source: hosted version: "2.1.2" sdks: - dart: ">=2.17.0-0 <3.0.0" - flutter: ">1.21.0" + dart: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 0373773..a50ef89 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,12 +1,11 @@ name: optimized_gesture_detector description: a optimized class on flutter GestureDector -version: 0.1.1 -author: SunPointed<410338643@qq.com> +version: 1.0.0 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: - sdk: '>=2.12.0 <3.0.0' - flutter: ">1.21.0" + sdk: '>=2.17.0 <3.0.0' + flutter: ">=3.0.0" dependencies: flutter: From cfec73dc764236cfedd7d69cad71d57344651d7c Mon Sep 17 00:00:00 2001 From: Absar Date: Fri, 17 Mar 2023 16:25:23 +0100 Subject: [PATCH 07/15] * Flutter 3.7 updates * Fix lint issues --- CHANGELOG.md | 3 ++ example/pubspec.lock | 88 ++++++++++++++++++++++++++++---------------- lib/scale.dart | 1 - pubspec.lock | 83 ++++++++++++++++++++++++++--------------- pubspec.yaml | 2 +- 5 files changed, 115 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index daab94e..d8bd9f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## [1.0.1] - 20230317 +* Flutter 3.7 updates +* Fix lint issues ## [1.0.0] - 20221016 * Flutter 3.3 fixes * Upgrade dependencies cupertino_icons diff --git a/example/pubspec.lock b/example/pubspec.lock index 487a148..1fe7380 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,49 +5,56 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted version: "1.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" flutter: @@ -60,25 +67,36 @@ packages: description: flutter source: sdk version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted version: "1.8.0" optimized_gesture_detector: @@ -87,12 +105,13 @@ packages: path: ".." relative: true source: path - version: "1.0.0" + version: "1.0.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" sky_engine: @@ -104,51 +123,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.4.16" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: - dart: ">=2.17.0 <3.0.0" + dart: ">=2.18.0 <3.0.0" flutter: ">=3.0.0" diff --git a/lib/scale.dart b/lib/scale.dart index 6465622..9dabef2 100644 --- a/lib/scale.dart +++ b/lib/scale.dart @@ -1,5 +1,4 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/widgets.dart'; import 'dart:math' as math; /// Signature for when the pointers in contact with the screen have established diff --git a/pubspec.lock b/pubspec.lock index 263df9e..583f46f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,42 +5,48 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" flutter: @@ -53,32 +59,44 @@ packages: description: flutter source: sdk version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted version: "1.8.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" sky_engine: @@ -90,51 +108,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.4.16" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: - dart: ">=2.17.0 <3.0.0" + dart: ">=2.18.0 <3.0.0" flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index a50ef89..e9ab790 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: optimized_gesture_detector description: a optimized class on flutter GestureDector -version: 1.0.0 +version: 1.0.1 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: From 86bb038ba661ac89a16398fb5aab882f5f24cf81 Mon Sep 17 00:00:00 2001 From: Absar Date: Sun, 11 Jun 2023 18:15:52 +0200 Subject: [PATCH 08/15] Flutter 3.10 updates --- CHANGELOG.md | 2 ++ example/pubspec.lock | 36 ++++++++++++++++++------------------ example/pubspec.yaml | 4 ++-- pubspec.lock | 34 +++++++++++++++++----------------- pubspec.yaml | 4 ++-- 5 files changed, 41 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8bd9f8..9bf1b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.1.0] 2023-06-11 +* Flutter 3.10 updates ## [1.0.1] - 20230317 * Flutter 3.7 updates * Fix lint issues diff --git a/example/pubspec.lock b/example/pubspec.lock index 1fe7380..54dbfbc 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" cupertino_icons: dependency: "direct main" description: @@ -71,18 +71,18 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -95,25 +95,25 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" optimized_gesture_detector: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.0.1" + version: "1.1.0" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" sky_engine: dependency: transitive description: flutter @@ -163,10 +163,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" vector_math: dependency: transitive description: @@ -176,5 +176,5 @@ packages: source: hosted version: "2.1.4" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 58adae1..f2de84c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,10 +11,10 @@ description: A new Flutter application. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.0+1 +version: 1.1.0 environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <4.0.0' dependencies: flutter: diff --git a/pubspec.lock b/pubspec.lock index 583f46f..c8743db 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" fake_async: dependency: transitive description: @@ -63,18 +63,18 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -87,18 +87,18 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" sky_engine: dependency: transitive description: flutter @@ -148,10 +148,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" vector_math: dependency: transitive description: @@ -161,5 +161,5 @@ packages: source: hosted version: "2.1.4" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index e9ab790..d5c0b3f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,10 +1,10 @@ name: optimized_gesture_detector description: a optimized class on flutter GestureDector -version: 1.0.1 +version: 1.1.0 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <4.0.0' flutter: ">=3.0.0" dependencies: From ba5a688bc9bcc3032a15f60e5659e2702e437bfd Mon Sep 17 00:00:00 2001 From: Absar Date: Fri, 27 Oct 2023 23:56:54 +0200 Subject: [PATCH 09/15] Update sdk constraints to >=3.0.0 <4.0.0 * Upgrade example app dependencies cupertino_icons --- CHANGELOG.md | 3 +++ example/pubspec.lock | 44 ++++++++++++++++++++++---------------------- example/pubspec.yaml | 6 +++--- pubspec.lock | 38 +++++++++++++++++++------------------- pubspec.yaml | 4 ++-- 5 files changed, 49 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bf1b78..5064e3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## [1.2.0] 2023-10-27 +* Update sdk constraints to >=3.0.0 <4.0.0 +* Upgrade example app dependencies cupertino_icons ## [1.1.0] 2023-06-11 * Flutter 3.10 updates ## [1.0.1] - 20230317 diff --git a/example/pubspec.lock b/example/pubspec.lock index 54dbfbc..f3a8032 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,18 +37,18 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" fake_async: dependency: transitive description: @@ -67,30 +67,22 @@ packages: description: flutter source: sdk version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -105,7 +97,7 @@ packages: path: ".." relative: true source: path - version: "1.1.0" + version: "1.2.0" path: dependency: transitive description: @@ -123,10 +115,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -163,10 +155,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -175,6 +167,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index f2de84c..e1048f5 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,10 +11,10 @@ description: A new Flutter application. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.0 +version: 1.2.0 environment: - sdk: '>=2.19.0 <4.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: flutter: @@ -24,7 +24,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.5 + cupertino_icons: ^1.0.6 dev_dependencies: flutter_test: diff --git a/pubspec.lock b/pubspec.lock index c8743db..d8e9fb0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" fake_async: dependency: transitive description: @@ -59,30 +59,22 @@ packages: description: flutter source: sdk version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -108,10 +100,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -148,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -160,6 +152,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index d5c0b3f..68b289e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,10 +1,10 @@ name: optimized_gesture_detector description: a optimized class on flutter GestureDector -version: 1.1.0 +version: 1.2.0 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: - sdk: '>=2.19.0 <4.0.0' + sdk: '>=3.0.0 <4.0.0' flutter: ">=3.0.0" dependencies: From 4a8c766093e95c322157e68d3fda7644366ece2f Mon Sep 17 00:00:00 2001 From: Absar Date: Thu, 21 Dec 2023 23:54:25 +0100 Subject: [PATCH 10/15] Flutter 3.16 updates --- CHANGELOG.md | 2 ++ example/pubspec.lock | 28 ++++++++++++++-------------- pubspec.lock | 26 +++++++++++++------------- pubspec.yaml | 4 ++-- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5064e3c..c56eedd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.2.1] 2023-12-21 +* Flutter 3.16 updates ## [1.2.0] 2023-10-27 * Update sdk constraints to >=3.0.0 <4.0.0 * Upgrade example app dependencies cupertino_icons diff --git a/example/pubspec.lock b/example/pubspec.lock index f3a8032..06fd588 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -87,17 +87,17 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" optimized_gesture_detector: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.2.0" + version: "1.2.1" path: dependency: transitive description: @@ -123,18 +123,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -155,10 +155,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -171,10 +171,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.0.0" diff --git a/pubspec.lock b/pubspec.lock index d8e9fb0..6494421 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 68b289e..3e6fc0c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: optimized_gesture_detector -description: a optimized class on flutter GestureDector -version: 1.2.0 +description: An optimized class on flutter GestureDetector +version: 1.2.1 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: From 67191d655168df5c9e80390bd2e780c53d7229ce Mon Sep 17 00:00:00 2001 From: Absar Date: Sat, 31 Aug 2024 15:45:35 +0200 Subject: [PATCH 11/15] Upgrade example app dependencies cupertino_icons --- CHANGELOG.md | 2 ++ example/pubspec.lock | 62 ++++++++++++++++++++++++++++++-------------- example/pubspec.yaml | 4 +-- pubspec.lock | 56 +++++++++++++++++++++++++++------------ pubspec.yaml | 2 +- 5 files changed, 88 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c56eedd..73cbe3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.2.2] 2024-08-31 +* Upgrade example app dependencies cupertino_icons ## [1.2.1] 2023-12-21 * Flutter 3.16 updates ## [1.2.0] 2023-10-27 diff --git a/example/pubspec.lock b/example/pubspec.lock index 06fd588..758092f 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: "direct main" description: name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.8" fake_async: dependency: transitive description: @@ -67,45 +67,69 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" matcher: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" optimized_gesture_detector: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.2.1" + version: "1.2.2" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -155,10 +179,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" vector_math: dependency: transitive description: @@ -167,14 +191,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: + vm_service: dependency: transitive description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "14.2.1" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index e1048f5..7fc5b7c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter application. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.0 +version: 1.2.2 environment: sdk: '>=3.0.0 <4.0.0' @@ -24,7 +24,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.6 + cupertino_icons: ^1.0.8 dev_dependencies: flutter_test: diff --git a/pubspec.lock b/pubspec.lock index 6494421..203ecd5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -59,38 +59,62 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" matcher: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -140,10 +164,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" vector_math: dependency: transitive description: @@ -152,14 +176,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: + vm_service: dependency: transitive description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "14.2.1" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index 3e6fc0c..6b9d847 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: optimized_gesture_detector description: An optimized class on flutter GestureDetector -version: 1.2.1 +version: 1.2.2 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: From 9d2f85ceb23b3445a9d279c76e4c32eb250959cd Mon Sep 17 00:00:00 2001 From: Absar Date: Fri, 20 Sep 2024 02:02:47 +0200 Subject: [PATCH 12/15] BREAKING: Update minimum supported Flutter to 3.22, Dart to 3.3 --- CHANGELOG.md | 2 + example/pubspec.lock | 4 +- example/pubspec.yaml | 2 +- lib/optimized_gesture_detector.dart | 66 ++++++++--------------------- pubspec.lock | 2 +- pubspec.yaml | 6 +-- 6 files changed, 27 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73cbe3e..fab95ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.3.0] 2024-09-20 +* BREAKING: Update minimum supported Flutter to 3.22, Dart to 3.3 ## [1.2.2] 2024-08-31 * Upgrade example app dependencies cupertino_icons ## [1.2.1] 2023-12-21 diff --git a/example/pubspec.lock b/example/pubspec.lock index 758092f..9d168ef 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -121,7 +121,7 @@ packages: path: ".." relative: true source: path - version: "1.2.2" + version: "1.3.0" path: dependency: transitive description: @@ -201,4 +201,4 @@ packages: version: "14.2.1" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.22.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 7fc5b7c..417df63 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,7 +14,7 @@ description: A new Flutter application. version: 1.2.2 environment: - sdk: '>=3.0.0 <4.0.0' + sdk: '>=3.3.0 <4.0.0' dependencies: flutter: diff --git a/lib/optimized_gesture_detector.dart b/lib/optimized_gesture_detector.dart index 4ad8e37..11e558a 100644 --- a/lib/optimized_gesture_detector.dart +++ b/lib/optimized_gesture_detector.dart @@ -126,9 +126,7 @@ class OptimizedGestureDetector extends StatelessWidget { } } - if (_tapDownCallback != null) { - _tapDownCallback!(details); - } + _tapDownCallback?.call(details); }, onTapUp: (details) { Util.L1("onTapUp", details); @@ -157,9 +155,7 @@ class OptimizedGestureDetector extends StatelessWidget { _isSingleTap = false; _isDoubleTap = false; _cancelAndResetSingleTapTimer(); - if (_tapCancelCallback != null) { - _tapCancelCallback!(); - } + _tapCancelCallback?.call(); }, onLongPressStart: (details) { Util.L1("onLongPressStart", details); @@ -218,64 +214,48 @@ class OptimizedGestureDetector extends StatelessWidget { void _singleTap(TapUpDetails details) { Util.L1("_singleTap", details); - if (_singleTapCallback != null) { - _singleTapCallback!(details); - } + _singleTapCallback?.call(details); } void _doubleTap(TapUpDetails details) { Util.L1("_doubleTap", details); - if (_doubleTapCallback != null) { - _doubleTapCallback!(details); - } + _doubleTapCallback?.call(details); } /// _drag* methods means long press then move void _dragStart(LongPressStartDetails details) { Util.L1("_dragStart", details); - if (_dragStartCallback != null) { - _dragStartCallback!(details); - } + _dragStartCallback?.call(details); } void _dragUpdate(LongPressMoveUpdateDetails details) { Util.L1("_dragUpdate", details); - if (_dragUpdateCallback != null) { - _dragUpdateCallback!(details); - } + _dragUpdateCallback?.call(details); } void _dragEnd(LongPressEndDetails details) { Util.L1("_dragEnd", details); - if (_dragEndCallback != null) { - _dragEndCallback!(details); - } + _dragEndCallback?.call(details); } /// _move* methods means tap then move void _moveStart(scale.OpsSStartDetails details) { Util.L1("_moveStart", details); _resetLastMoveUpdatePos(); - if (_moveStartCallback != null) { - _moveStartCallback!(DetailsUtils.toOpsMoveStartDetails(details)); - } + _moveStartCallback?.call(DetailsUtils.toOpsMoveStartDetails(details)); } void _moveUpdate(scale.OpsSUpdateDetails details) { Util.L1("_moveUpdate", details); - if (_moveUpdateCallback != null) { - _moveUpdateCallback!(DetailsUtils.toOpsMoveUpdateDetails(details)); - } + _moveUpdateCallback?.call(DetailsUtils.toOpsMoveUpdateDetails(details)); _lastMoveUpdateGolbalPos = details.focalPoint; _lastMoveUpdateLocalPos = details.localFocalPoint; } void _moveEnd(scale.OpsSEndDetails details) { Util.L1("_moveEnd", details); - if (_moveEndCallback != null) { - _moveEndCallback!(DetailsUtils.toOpsMoveEndDetails(details, - _lastMoveUpdateGolbalPos ?? ZERO, _lastMoveUpdateLocalPos ?? ZERO)); - } + _moveEndCallback?.call(DetailsUtils.toOpsMoveEndDetails(details, + _lastMoveUpdateGolbalPos ?? ZERO, _lastMoveUpdateLocalPos ?? ZERO)); _resetLastMoveUpdatePos(); } @@ -283,9 +263,7 @@ class OptimizedGestureDetector extends StatelessWidget { Util.L2("_moveCancel"); _isMoveCancel = true; _resetLastMoveUpdatePos(); - if (_moveCancelCallback != null) { - _moveCancelCallback!(); - } + _moveCancelCallback?.call(); } /// _scale* methods means zoom then move @@ -293,9 +271,7 @@ class OptimizedGestureDetector extends StatelessWidget { Util.L1("_scaleStart", details); _resetScaleDirection(); _resetLastScaleUpdatePos(); - if (_scaleStartCallback != null) { - _scaleStartCallback!(DetailsUtils.toOpsScaleStartDetails(details)); - } + _scaleStartCallback?.call(DetailsUtils.toOpsScaleStartDetails(details)); } void _scaleUpdate(scale.OpsSUpdateDetails details) { @@ -318,10 +294,8 @@ class OptimizedGestureDetector extends StatelessWidget { } Util.L2("direction $_scaleMainDirection"); - if (_scaleUpdateCallback != null) { - _scaleUpdateCallback!(DetailsUtils.toOpsScaleUpdateDetails( - details, _scaleMainDirection)); - } + _scaleUpdateCallback?.call( + DetailsUtils.toOpsScaleUpdateDetails(details, _scaleMainDirection)); } } _lastScaleUpdateGolbalPos = details.focalPoint; @@ -331,10 +305,8 @@ class OptimizedGestureDetector extends StatelessWidget { void _scaleEnd(scale.OpsSEndDetails details) { Util.L1("_scaleEnd", details); _resetScaleDirection(); - if (_scaleEndCallback != null) { - _scaleEndCallback!(DetailsUtils.toOpsScaleEndDetails(details, - _lastScaleUpdateGolbalPos ?? ZERO, _lastScaleUpdateLocalPos ?? ZERO)); - } + _scaleEndCallback?.call(DetailsUtils.toOpsScaleEndDetails(details, + _lastScaleUpdateGolbalPos ?? ZERO, _lastScaleUpdateLocalPos ?? ZERO)); _resetLastScaleUpdatePos(); } @@ -343,9 +315,7 @@ class OptimizedGestureDetector extends StatelessWidget { _isScaleCancel = true; _resetScaleDirection(); _resetLastScaleUpdatePos(); - if (_scaleCancelCallback != null) { - _scaleCancelCallback!(); - } + _scaleCancelCallback?.call(); } void _resetLastMoveUpdatePos() { diff --git a/pubspec.lock b/pubspec.lock index 203ecd5..de7363f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -186,4 +186,4 @@ packages: version: "14.2.1" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6b9d847..2f0afff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: optimized_gesture_detector description: An optimized class on flutter GestureDetector -version: 1.2.2 +version: 1.3.0 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: - sdk: '>=3.0.0 <4.0.0' - flutter: ">=3.0.0" + sdk: '>=3.3.0 <4.0.0' + flutter: ">=3.22.0" dependencies: flutter: From ba0efc81204000f87f40cdc31671663474e5424f Mon Sep 17 00:00:00 2001 From: Absar Date: Tue, 8 Oct 2024 01:55:42 +0200 Subject: [PATCH 13/15] Example app: Upgrade kotlin plugin from 1.7.20 to 1.8.22 and Gradle from 8.2 to 8.3, to sync it with Flutter 3.24 --- CHANGELOG.md | 2 ++ example/android/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/pubspec.lock | 26 +++++++++---------- example/pubspec.yaml | 2 +- pubspec.lock | 24 ++++++++--------- pubspec.yaml | 2 +- 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fab95ad..56aa7a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.3.1] 2024-10-08 +* Example app: Upgrade kotlin plugin from 1.7.20 to 1.8.22 and Gradle from 8.2 to 8.3, to sync it with Flutter 3.24 ## [1.3.0] 2024-09-20 * BREAKING: Update minimum supported Flutter to 3.22, Dart to 3.3 ## [1.2.2] 2024-08-31 diff --git a/example/android/build.gradle b/example/android/build.gradle index b7faad8..fa32de1 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.8.22' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..91e6113 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip diff --git a/example/pubspec.lock b/example/pubspec.lock index 9d168ef..3de12f4 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -71,18 +71,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: @@ -103,25 +103,25 @@ 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" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" optimized_gesture_detector: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.3.0" + version: "1.3.1" path: dependency: transitive description: @@ -179,10 +179,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" vector_math: dependency: transitive description: @@ -195,10 +195,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" sdks: dart: ">=3.3.0 <4.0.0" flutter: ">=3.22.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 417df63..caa1645 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter application. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.2 +version: 1.2.3 environment: sdk: '>=3.3.0 <4.0.0' diff --git a/pubspec.lock b/pubspec.lock index de7363f..a36dae5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,18 +63,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: @@ -95,18 +95,18 @@ 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" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" path: dependency: transitive description: @@ -164,10 +164,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" vector_math: dependency: transitive description: @@ -180,10 +180,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" sdks: dart: ">=3.3.0 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2f0afff..2bfda77 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: optimized_gesture_detector description: An optimized class on flutter GestureDetector -version: 1.3.0 +version: 1.3.1 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: From f4c918d8244e00b6c3e155bfd9e4e252cd3fb2d0 Mon Sep 17 00:00:00 2001 From: Absar Date: Sun, 3 Aug 2025 22:03:04 +0200 Subject: [PATCH 14/15] Flutter 3.32 updates --- CHANGELOG.md | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../Flutter/ephemeral/flutter_lldb_helper.py | 32 ++++++++ .../ios/Flutter/ephemeral/flutter_lldbinit | 5 ++ example/pubspec.lock | 78 +++++++++---------- pubspec.lock | 76 +++++++++--------- pubspec.yaml | 2 +- 7 files changed, 118 insertions(+), 79 deletions(-) create mode 100644 example/ios/Flutter/ephemeral/flutter_lldb_helper.py create mode 100644 example/ios/Flutter/ephemeral/flutter_lldbinit diff --git a/CHANGELOG.md b/CHANGELOG.md index 56aa7a7..f7de0e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.3.2] 2025-08-03 +* Flutter 3.32 updates ## [1.3.1] 2024-10-08 * Example app: Upgrade kotlin plugin from 1.7.20 to 1.8.22 and Gradle from 8.2 to 8.3, to sync it with Flutter 3.24 ## [1.3.0] 2024-09-20 diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 91e6113..d955bd4 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip diff --git a/example/ios/Flutter/ephemeral/flutter_lldb_helper.py b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py new file mode 100644 index 0000000..a88caf9 --- /dev/null +++ b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py @@ -0,0 +1,32 @@ +# +# Generated file, do not edit. +# + +import lldb + +def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict): + """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages.""" + base = frame.register["x0"].GetValueAsAddress() + page_len = frame.register["x1"].GetValueAsUnsigned() + + # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the + # first page to see if handled it correctly. This makes diagnosing + # misconfiguration (e.g. missing breakpoint) easier. + data = bytearray(page_len) + data[0:8] = b'IHELPED!' + + error = lldb.SBError() + frame.GetThread().GetProcess().WriteMemory(base, data, error) + if not error.Success(): + print(f'Failed to write into {base}[+{page_len}]', error) + return + +def __lldb_init_module(debugger: lldb.SBDebugger, _): + target = debugger.GetDummyTarget() + # Caveat: must use BreakpointCreateByRegEx here and not + # BreakpointCreateByName. For some reasons callback function does not + # get carried over from dummy target for the later. + bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$") + bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__)) + bp.SetAutoContinue(True) + print("-- LLDB integration loaded --") diff --git a/example/ios/Flutter/ephemeral/flutter_lldbinit b/example/ios/Flutter/ephemeral/flutter_lldbinit new file mode 100644 index 0000000..e3ba6fb --- /dev/null +++ b/example/ios/Flutter/ephemeral/flutter_lldbinit @@ -0,0 +1,5 @@ +# +# Generated file, do not edit. +# + +command script import --relative-to-command-file flutter_lldb_helper.py diff --git a/example/pubspec.lock b/example/pubspec.lock index 3de12f4..4d0230e 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,42 +5,42 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" cupertino_icons: dependency: "direct main" description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -71,18 +71,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -95,10 +95,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -111,78 +111,78 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" optimized_gesture_detector: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.3.1" + version: "1.3.2" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.4" vector_math: dependency: transitive description: @@ -195,10 +195,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "15.0.0" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.lock b/pubspec.lock index a36dae5..bc8ced1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,50 +5,50 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -63,18 +63,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -87,10 +87,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -103,71 +103,71 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.4" vector_math: dependency: transitive description: @@ -180,10 +180,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "15.0.0" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2bfda77..5a0da7d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: optimized_gesture_detector description: An optimized class on flutter GestureDetector -version: 1.3.1 +version: 1.3.2 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: From 686da038975834d9a368baf69f17ba650b4c7469 Mon Sep 17 00:00:00 2001 From: Absar Date: Sat, 7 Feb 2026 22:21:24 +0100 Subject: [PATCH 15/15] * BREAKING: Flutter 3.38 updates * BREAKING: Bump minimum supported Flutter version to 3.35 * Upgrade example app to Gradle 8.14 and Gradle Plugin DSL * Upgrade example sourceCompatibility JavaVersion.VERSION_17, targetCompatibility JavaVersion.VERSION_17 * Upgrade example Kotlin to 2.2.21 --- CHANGELOG.md | 7 +++ example/android/app/build.gradle | 35 +++++++++------ example/android/build.gradle | 17 +------- example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 31 ++++++++----- example/pubspec.lock | 38 ++++++++-------- example/pubspec.yaml | 35 +-------------- pubspec.lock | 28 ++++++------ pubspec.yaml | 43 ++----------------- 10 files changed, 92 insertions(+), 146 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7de0e8..1a1379f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.4.0] 2026-02-07 +* BREAKING: Flutter 3.38 updates +* BREAKING: Bump minimum supported Flutter version to 3.35 +* Upgrade example app to Gradle 8.14 and Gradle Plugin DSL +* Upgrade example sourceCompatibility JavaVersion.VERSION_17, targetCompatibility JavaVersion.VERSION_17 +* Upgrade example Kotlin to 2.2.21 + ## [1.3.2] 2025-08-03 * Flutter 3.32 updates ## [1.3.1] 2024-10-08 diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 4089a56..51dc684 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,12 +22,21 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 28 + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + // Flag to enable support for the new language APIs + coreLibraryDesugaringEnabled true + // Sets Java compatibility + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -39,8 +49,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.lqy.example" - minSdkVersion 16 - targetSdkVersion 28 + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -60,7 +70,6 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/example/android/build.gradle b/example/android/build.gradle index fa32de1..bc157bd 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,20 +1,7 @@ -buildscript { - ext.kotlin_version = '1.8.22' - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -26,6 +13,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 2bd6f4f..8bf2b5f 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,2 +1,2 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index d955bd4..60f07d9 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip \ No newline at end of file diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 5a2f14f..0008767 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,15 +1,26 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version '8.13.2' apply false + id "org.jetbrains.kotlin.android" version "2.2.21" apply false } + +include ":app" diff --git a/example/pubspec.lock b/example/pubspec.lock index 4d0230e..9c3b3c7 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -71,26 +71,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.9" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" matcher: dependency: transitive description: @@ -111,17 +111,17 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" optimized_gesture_detector: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.3.2" + version: "1.4.0" path: dependency: transitive description: @@ -139,10 +139,10 @@ packages: dependency: transitive description: name: source_span - sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" url: "https://pub.dev" source: hosted - version: "1.10.1" + version: "1.10.2" stack_trace: dependency: transitive description: @@ -179,26 +179,26 @@ packages: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "15.0.2" sdks: - dart: ">=3.7.0-0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.10.8 <4.0.0" + flutter: ">=3.35.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index caa1645..97a93bd 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,10 +11,10 @@ description: A new Flutter application. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.3 +version: 1.3.0 environment: - sdk: '>=3.3.0 <4.0.0' + sdk: '>=3.10.8 <4.0.0' dependencies: flutter: @@ -41,34 +41,3 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages diff --git a/pubspec.lock b/pubspec.lock index bc8ced1..4dd7081 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,26 +63,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.9" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" matcher: dependency: transitive description: @@ -103,10 +103,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" path: dependency: transitive description: @@ -164,18 +164,18 @@ packages: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: @@ -185,5 +185,5 @@ packages: source: hosted version: "15.0.0" sdks: - dart: ">=3.7.0-0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.10.8 <4.0.0" + flutter: ">=3.35.0" diff --git a/pubspec.yaml b/pubspec.yaml index 5a0da7d..56c7206 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: optimized_gesture_detector description: An optimized class on flutter GestureDetector -version: 1.3.2 +version: 1.4.0 homepage: https://github.com/SunPointed/OptimizedGestureDetector environment: - sdk: '>=3.3.0 <4.0.0' - flutter: ">=3.22.0" + sdk: '>=3.10.8 <4.0.0' + flutter: ">=3.35.0" dependencies: flutter: @@ -14,40 +14,3 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter. -flutter: - - # To add assets to your package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # To add custom fonts to your package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/custom-fonts/#from-packages