Unverified Commit c8e53b38 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Add null safety options to build ios-framework (#60111)

parent 8fce4ce9
...@@ -28,6 +28,7 @@ class BuildCommand extends FlutterCommand { ...@@ -28,6 +28,7 @@ class BuildCommand extends FlutterCommand {
addSubcommand(BuildIOSCommand(verboseHelp: verboseHelp)); addSubcommand(BuildIOSCommand(verboseHelp: verboseHelp));
addSubcommand(BuildIOSFrameworkCommand( addSubcommand(BuildIOSFrameworkCommand(
buildSystem: globals.buildSystem, buildSystem: globals.buildSystem,
verboseHelp: verboseHelp,
)); ));
addSubcommand(BuildBundleCommand(verboseHelp: verboseHelp)); addSubcommand(BuildBundleCommand(verboseHelp: verboseHelp));
addSubcommand(BuildWebCommand(verboseHelp: verboseHelp)); addSubcommand(BuildWebCommand(verboseHelp: verboseHelp));
......
...@@ -37,6 +37,7 @@ class BuildIOSFrameworkCommand extends BuildSubCommand { ...@@ -37,6 +37,7 @@ class BuildIOSFrameworkCommand extends BuildSubCommand {
BuildIOSFrameworkCommand({ BuildIOSFrameworkCommand({
FlutterVersion flutterVersion, // Instantiating FlutterVersion kicks off networking, so delay until it's needed, but allow test injection. FlutterVersion flutterVersion, // Instantiating FlutterVersion kicks off networking, so delay until it's needed, but allow test injection.
@required BuildSystem buildSystem, @required BuildSystem buildSystem,
@required bool verboseHelp,
Cache cache, Cache cache,
Platform platform Platform platform
}) : _flutterVersion = flutterVersion, }) : _flutterVersion = flutterVersion,
...@@ -51,6 +52,9 @@ class BuildIOSFrameworkCommand extends BuildSubCommand { ...@@ -51,6 +52,9 @@ class BuildIOSFrameworkCommand extends BuildSubCommand {
addSplitDebugInfoOption(); addSplitDebugInfoOption();
addDartObfuscationOption(); addDartObfuscationOption();
usesExtraFrontendOptions(); usesExtraFrontendOptions();
addNullSafetyModeOptions(hide: !verboseHelp);
addEnableExperimentation(hide: !verboseHelp);
argParser argParser
..addFlag('debug', ..addFlag('debug',
negatable: true, negatable: true,
......
...@@ -66,7 +66,8 @@ void main() { ...@@ -66,7 +66,8 @@ void main() {
buildSystem: MockBuildSystem(), buildSystem: MockBuildSystem(),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache cache: mockCache,
verboseHelp: false,
); );
expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory), expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory),
...@@ -90,7 +91,8 @@ void main() { ...@@ -90,7 +91,8 @@ void main() {
buildSystem: MockBuildSystem(), buildSystem: MockBuildSystem(),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache cache: mockCache,
verboseHelp: false,
); );
expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory), expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory),
...@@ -111,7 +113,8 @@ void main() { ...@@ -111,7 +113,8 @@ void main() {
buildSystem: MockBuildSystem(), buildSystem: MockBuildSystem(),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache cache: mockCache,
verboseHelp: false,
); );
expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory), expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory),
...@@ -149,6 +152,7 @@ void main() { ...@@ -149,6 +152,7 @@ void main() {
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache, cache: mockCache,
verboseHelp: false,
); );
command.produceFlutterPodspec(BuildMode.debug, outputDirectory, force: true); command.produceFlutterPodspec(BuildMode.debug, outputDirectory, force: true);
...@@ -171,6 +175,7 @@ void main() { ...@@ -171,6 +175,7 @@ void main() {
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache, cache: mockCache,
verboseHelp: false,
); );
command.produceFlutterPodspec(BuildMode.debug, outputDirectory); command.produceFlutterPodspec(BuildMode.debug, outputDirectory);
...@@ -190,6 +195,7 @@ void main() { ...@@ -190,6 +195,7 @@ void main() {
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache, cache: mockCache,
verboseHelp: false,
); );
command.produceFlutterPodspec(BuildMode.debug, outputDirectory); command.produceFlutterPodspec(BuildMode.debug, outputDirectory);
...@@ -207,6 +213,7 @@ void main() { ...@@ -207,6 +213,7 @@ void main() {
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache, cache: mockCache,
verboseHelp: false,
); );
command.produceFlutterPodspec(BuildMode.profile, outputDirectory); command.produceFlutterPodspec(BuildMode.profile, outputDirectory);
...@@ -224,6 +231,7 @@ void main() { ...@@ -224,6 +231,7 @@ void main() {
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: mockFlutterVersion,
cache: mockCache, cache: mockCache,
verboseHelp: false,
); );
command.produceFlutterPodspec(BuildMode.release, outputDirectory); command.produceFlutterPodspec(BuildMode.release, outputDirectory);
......
...@@ -9,10 +9,12 @@ import 'package:flutter_tools/src/commands/build_apk.dart'; ...@@ -9,10 +9,12 @@ import 'package:flutter_tools/src/commands/build_apk.dart';
import 'package:flutter_tools/src/commands/build_appbundle.dart'; import 'package:flutter_tools/src/commands/build_appbundle.dart';
import 'package:flutter_tools/src/commands/build_fuchsia.dart'; import 'package:flutter_tools/src/commands/build_fuchsia.dart';
import 'package:flutter_tools/src/commands/build_ios.dart'; import 'package:flutter_tools/src/commands/build_ios.dart';
import 'package:flutter_tools/src/commands/build_ios_framework.dart';
import 'package:flutter_tools/src/commands/build_linux.dart'; import 'package:flutter_tools/src/commands/build_linux.dart';
import 'package:flutter_tools/src/commands/build_macos.dart'; import 'package:flutter_tools/src/commands/build_macos.dart';
import 'package:flutter_tools/src/commands/build_web.dart'; import 'package:flutter_tools/src/commands/build_web.dart';
import 'package:flutter_tools/src/commands/build_windows.dart'; import 'package:flutter_tools/src/commands/build_windows.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import '../../src/common.dart'; import '../../src/common.dart';
import '../../src/context.dart'; import '../../src/context.dart';
...@@ -29,6 +31,7 @@ void main() { ...@@ -29,6 +31,7 @@ void main() {
BuildAppBundleCommand(verboseHelp: false), BuildAppBundleCommand(verboseHelp: false),
BuildFuchsiaCommand(verboseHelp: false), BuildFuchsiaCommand(verboseHelp: false),
BuildAarCommand(verboseHelp: false), BuildAarCommand(verboseHelp: false),
BuildIOSFrameworkCommand(verboseHelp: false, buildSystem: globals.buildSystem),
]; ];
for (final BuildSubCommand command in commands) { for (final BuildSubCommand command in commands) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment