Dont differentiate between ios_arm and ios_x64 in flutter_tools
All artifacts for iOS are universal.
diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart
index d376905..7e9f9c9 100644
--- a/packages/flutter_tools/lib/src/application_package.dart
+++ b/packages/flutter_tools/lib/src/application_package.dart
@@ -110,8 +110,7 @@
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 @@
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 db27a19..1794057 100644
--- a/packages/flutter_tools/lib/src/artifacts.dart
+++ b/packages/flutter_tools/lib/src/artifacts.dart
@@ -25,10 +25,8 @@
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 25c73a5..170c4bc 100644
--- a/packages/flutter_tools/lib/src/build_configuration.dart
+++ b/packages/flutter_tools/lib/src/build_configuration.dart
@@ -21,8 +21,7 @@
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 e752c3f..9aafbee 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -137,8 +137,7 @@
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 c618a5f..33af902 100644
--- a/packages/flutter_tools/lib/src/ios/devices.dart
+++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -229,7 +229,7 @@
}
@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 2c776d3..1b89bc4 100644
--- a/packages/flutter_tools/lib/src/ios/simulators.dart
+++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -573,7 +573,7 @@
}
@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 630f01d..4f6d55f 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 @@
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 @@
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 @@
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 @@
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 @@
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']
));
