已合并
补充单元测试 #374
qiaojianqiang创建于 2024年11月6日
补充单元测试 #374
已合并
从refs/pull/374/head合入到dev
共 28 个文件变更+2356-37
| @@ -22,7 +22,6 @@ class ConfigCommand extends FlutterCommand { | |||
| 22 | argParser.addOption('android-studio-dir', help: 'The Android Studio install directory.'); | 22 | argParser.addOption('android-studio-dir', help: 'The Android Studio install directory.'); |
| 23 | argParser.addOption('ohos-sdk', help: 'The OpenHarmony SDK directory.'); | 23 | argParser.addOption('ohos-sdk', help: 'The OpenHarmony SDK directory.'); |
| 24 | argParser.addOption('ohpm-home', help: 'The ohpm tool directory.'); | 24 | argParser.addOption('ohpm-home', help: 'The ohpm tool directory.'); |
| 25 | - argParser.addOption('signTool-home', help: 'The sign tool directory.'); | ||
| 26 | argParser.addOption('build-dir', help: 'The relative path to override a projects build directory.', | 25 | argParser.addOption('build-dir', help: 'The relative path to override a projects build directory.', |
| 27 | valueHelp: 'out/'); | 26 | valueHelp: 'out/'); |
| 28 | argParser.addFlag('machine', | 27 | argParser.addFlag('machine', |
| @@ -150,10 +149,6 @@ class ConfigCommand extends FlutterCommand { | |||
| 150 | _updateConfig('ohpm-home', stringArgDeprecated('ohpm-home')!); | 149 | _updateConfig('ohpm-home', stringArgDeprecated('ohpm-home')!); |
| 151 | } | 150 | } |
| 152 | 151 | ||
| 153 | - if (argResults?.wasParsed('signTool-home') ?? false) { | ||
| 154 | - _updateConfig('signTool-home', stringArgDeprecated('signTool-home')!); | ||
| 155 | - } | ||
| 156 | - | ||
| 157 | if (argResults?.wasParsed('clear-ios-signing-cert') ?? false) { | 152 | if (argResults?.wasParsed('clear-ios-signing-cert') ?? false) { |
| 158 | _updateConfig('ios-signing-cert', ''); | 153 | _updateConfig('ios-signing-cert', ''); |
| 159 | } | 154 | } |
| @@ -590,7 +590,7 @@ Your $application code is in $relativeAppMain. | |||
| 590 | 590 | ||
| 591 | final bool generateOhos = templateContext['ohos'] == true; | 591 | final bool generateOhos = templateContext['ohos'] == true; |
| 592 | if (generateOhos) { | 592 | if (generateOhos) { |
| 593 | - hvigor.updateLocalProperties(project: project); | 593 | + hvigor.updateLocalProperties(project: project, requireHarmonySdk: false); |
| 594 | } | 594 | } |
| 595 | 595 | ||
| 596 | final String? projectName = templateContext['projectName'] as String?; | 596 | final String? projectName = templateContext['projectName'] as String?; |
| @@ -29,7 +29,7 @@ class EmulatorsCommand extends FlutterCommand { | |||
| 29 | help: 'Used with the "--create" flag. Specifies a name for the emulator being created.'); | 29 | help: 'Used with the "--create" flag. Specifies a name for the emulator being created.'); |
| 30 | if (globals.platform.isWindows) { | 30 | if (globals.platform.isWindows) { |
| 31 | argParser.addFlag('launch-ohos-emulator', | 31 | argParser.addFlag('launch-ohos-emulator', |
| 32 | - help: 'Launch boot the emulator instance (Ohos only).'); | 32 | + help: 'Launch boot the emulator instance (Ohos only).'); |
| 33 | } | 33 | } |
| 34 | } | 34 | } |
| 35 | 35 | ||
Apackages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart+123-0文件内容审核中,请稍后刷新重试
Apackages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart+198-0文件内容审核中,请稍后刷新重试