From c8377d74287ddd6db28b9fd0cae9b355c88e7f3d Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Mon, 21 Mar 2016 14:41:26 -0700 Subject: [PATCH] Dont differentiate between ios_arm and ios_x64 in flutter_tools All artifacts for iOS are universal. --- .../lib/src/application_package.dart | 6 ++---- packages/flutter_tools/lib/src/artifacts.dart | 6 ++---- .../lib/src/build_configuration.dart | 3 +-- packages/flutter_tools/lib/src/commands/run.dart | 3 +-- packages/flutter_tools/lib/src/ios/devices.dart | 2 +- .../flutter_tools/lib/src/ios/simulators.dart | 2 +- .../lib/src/runner/flutter_command_runner.dart | 15 +++++---------- packages/flutter_tools/test/src/mocks.dart | 4 ++-- 8 files changed, 15 insertions(+), 26 deletions(-) diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart index d37690588f4..7e9f9c9bd19 100644 --- a/packages/flutter_tools/lib/src/application_package.dart +++ b/packages/flutter_tools/lib/src/application_package.dart @@ -110,8 +110,7 @@ class ApplicationPackageStore { switch (platform) { case TargetPlatform.android_arm: return android; - case TargetPlatform.ios_arm: - case TargetPlatform.ios_x64: + case TargetPlatform.ios: return iOS; case TargetPlatform.darwin_x64: case TargetPlatform.linux_x64: @@ -130,8 +129,7 @@ class ApplicationPackageStore { android = new AndroidApk.fromBuildConfiguration(config); break; - case TargetPlatform.ios_arm: - case TargetPlatform.ios_x64: + case TargetPlatform.ios: iOS ??= new IOSApp.fromBuildConfiguration(config); break; diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index db27a1961fe..1794057f04a 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -25,10 +25,8 @@ String getNameForTargetPlatform(TargetPlatform platform) { switch (platform) { case TargetPlatform.android_arm: return 'android-arm'; - case TargetPlatform.ios_arm: - return 'ios-arm'; - case TargetPlatform.ios_x64: - return 'ios-x64'; + case TargetPlatform.ios: + return 'ios'; case TargetPlatform.darwin_x64: return 'darwin-x64'; case TargetPlatform.linux_x64: diff --git a/packages/flutter_tools/lib/src/build_configuration.dart b/packages/flutter_tools/lib/src/build_configuration.dart index 25c73a58b41..170c4bc65d1 100644 --- a/packages/flutter_tools/lib/src/build_configuration.dart +++ b/packages/flutter_tools/lib/src/build_configuration.dart @@ -21,8 +21,7 @@ enum HostPlatform { enum TargetPlatform { android_arm, - ios_arm, - ios_x64, + ios, darwin_x64, linux_x64 } diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index e752c3f738e..9aafbee92cc 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart @@ -137,8 +137,7 @@ String _getMissingPackageHintForPlatform(TargetPlatform platform) { switch (platform) { case TargetPlatform.android_arm: return 'Is your project missing an android/AndroidManifest.xml?'; - case TargetPlatform.ios_arm: - case TargetPlatform.ios_x64: + case TargetPlatform.ios: return 'Is your project missing an ios/Info.plist?'; default: return null; diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index c618a5fbe94..33af902fa8a 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -229,7 +229,7 @@ class IOSDevice extends Device { } @override - TargetPlatform get platform => TargetPlatform.ios_arm; + TargetPlatform get platform => TargetPlatform.ios; @override DeviceLogReader get logReader { diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index 2c776d38421..1b89bc42d83 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart @@ -573,7 +573,7 @@ class IOSSimulator extends Device { } @override - TargetPlatform get platform => TargetPlatform.ios_x64; + TargetPlatform get platform => TargetPlatform.ios; @override DeviceLogReader get logReader { diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart index 630f01d4895..4f6d55fab83 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart @@ -286,12 +286,7 @@ class FlutterCommandRunner extends CommandRunner { if (hostPlatform == HostPlatform.mac) { configs.add(new BuildConfiguration.prebuilt( hostPlatform: HostPlatform.mac, - targetPlatform: TargetPlatform.ios_arm - )); - - configs.add(new BuildConfiguration.prebuilt( - hostPlatform: HostPlatform.mac, - targetPlatform: TargetPlatform.ios_x64 + targetPlatform: TargetPlatform.ios )); } } else { @@ -323,7 +318,7 @@ class FlutterCommandRunner extends CommandRunner { configs.add(new BuildConfiguration.local( type: BuildType.debug, hostPlatform: hostPlatform, - targetPlatform: TargetPlatform.ios_arm, + targetPlatform: TargetPlatform.ios, enginePath: enginePath, buildPath: globalResults['ios-debug-build-path'] )); @@ -331,7 +326,7 @@ class FlutterCommandRunner extends CommandRunner { configs.add(new BuildConfiguration.local( type: BuildType.debug, hostPlatform: hostPlatform, - targetPlatform: TargetPlatform.ios_x64, + targetPlatform: TargetPlatform.ios, enginePath: enginePath, buildPath: globalResults['ios-sim-debug-build-path'] )); @@ -360,7 +355,7 @@ class FlutterCommandRunner extends CommandRunner { configs.add(new BuildConfiguration.local( type: BuildType.release, hostPlatform: hostPlatform, - targetPlatform: TargetPlatform.ios_arm, + targetPlatform: TargetPlatform.ios, enginePath: enginePath, buildPath: globalResults['ios-release-build-path'] )); @@ -368,7 +363,7 @@ class FlutterCommandRunner extends CommandRunner { configs.add(new BuildConfiguration.local( type: BuildType.release, hostPlatform: hostPlatform, - targetPlatform: TargetPlatform.ios_x64, + targetPlatform: TargetPlatform.ios, enginePath: enginePath, buildPath: globalResults['ios-sim-release-build-path'] )); diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index 1219a9dc60e..3fcdeee8ebf 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -45,7 +45,7 @@ class MockAndroidDevice extends Mock implements AndroidDevice { class MockIOSDevice extends Mock implements IOSDevice { @override - TargetPlatform get platform => TargetPlatform.ios_arm; + TargetPlatform get platform => TargetPlatform.ios; @override bool isSupported() => true; @@ -53,7 +53,7 @@ class MockIOSDevice extends Mock implements IOSDevice { class MockIOSSimulator extends Mock implements IOSSimulator { @override - TargetPlatform get platform => TargetPlatform.ios_x64; + TargetPlatform get platform => TargetPlatform.ios; @override bool isSupported() => true;