diff --git a/packages/flutter/lib/src/widgets/scroll_activity.dart b/packages/flutter/lib/src/widgets/scroll_activity.dart index 4d4ccd681c04738f67b6ad4e2f112790a9ace3fc..aa0f92958ed7384332a291550b336494dce0a1df 100644 --- a/packages/flutter/lib/src/widgets/scroll_activity.dart +++ b/packages/flutter/lib/src/widgets/scroll_activity.dart @@ -385,7 +385,7 @@ class ScrollDragController implements Drag { ) * offset.sign; } } else { - return offset < 0 ? offset - 1.0 : offset + 1.0; + return 0.0; } } } diff --git a/packages/flutter_tools/lib/src/commands/build_app.dart b/packages/flutter_tools/lib/src/commands/build_app.dart index d91b54c972086d6576ef35621d4052c86e4d138b..7233fe78bf991821fcf6de0eecadbd1fe50cfb5b 100644 --- a/packages/flutter_tools/lib/src/commands/build_app.dart +++ b/packages/flutter_tools/lib/src/commands/build_app.dart @@ -29,6 +29,8 @@ class BuildAppCommand extends BuildSubCommand { addBuildModeFlags(verboseHelp: verboseHelp); usesFlavorOption(); usesPubOption(); + usesBuildNumberOption(); + usesBuildNameOption(); addShrinkingFlag(verboseHelp: verboseHelp); addSplitDebugInfoOption(); addDartObfuscationOption(); diff --git a/packages/flutter_tools/lib/src/ohos/application_package.dart b/packages/flutter_tools/lib/src/ohos/application_package.dart index 51a5deaa7157a270dce95a0d4fbea50a20cb5ffc..2529a22372c5fd77d2f9ac3af6ba9dd43f0d491b 100644 --- a/packages/flutter_tools/lib/src/ohos/application_package.dart +++ b/packages/flutter_tools/lib/src/ohos/application_package.dart @@ -274,6 +274,7 @@ class OhosModule { required String modulePath, String? flavor, }) { + modulePath = globals.fs.path.normalize(globals.fs.file(modulePath).resolveSymbolicLinksSync()); final String moduleJsonPath = globals.fs.path.join(modulePath, 'src', 'main', 'module.json5'); final File moduleJsonFile = globals.fs.file(moduleJsonPath); if (!moduleJsonFile.existsSync()) { diff --git a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart index 0a89fe2dd6c1de1d0b04f9aafa7a190d9d7d772f..c0035dd27cc9bf3992d69623998f97277c086565 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart @@ -195,5 +195,8 @@ Future addFlutterModuleAndPluginsOverrides(FlutterProject flutterProject) } String _relative(String path, {String? from}) { - return globals.fs.path.relative(path, from: from).replaceAll(r'\', '/'); + final String realPath = globals.fs.file(path).resolveSymbolicLinksSync(); + final String realFrom = globals.fs.file(from).resolveSymbolicLinksSync(); + final String result = globals.fs.path.relative(realPath, from: realFrom).replaceAll(r'\', '/'); + return result; }