Revert "Check for watch companion in build settings (#113956)" (#114035)

jmagman · web-flow · commit 9f5c6553bcbd · 2022-10-25T13:33:35.000-07:00
This reverts commit e133721.
diff --git a/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.pbxproj
@@ -727,7 +727,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = watch_Extension;
 				INFOPLIST_FILE = watch/Info.plist;
-				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.flutter.extensionTest;
 				MARKETING_VERSION = 1.0.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -758,7 +757,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = watch_Extension;
 				INFOPLIST_FILE = watch/Info.plist;
-				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.flutter.extensionTest;
 				MARKETING_VERSION = 1.0.0;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "";
@@ -787,7 +785,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = watch_Extension;
 				INFOPLIST_FILE = watch/Info.plist;
-				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.flutter.extensionTest;
 				MARKETING_VERSION = 1.0.0;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "";
diff --git a/dev/integration_tests/ios_app_with_extensions/ios/watch/Info.plist b/dev/integration_tests/ios_app_with_extensions/ios/watch/Info.plist
@@ -25,6 +25,8 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
+	<key>WKCompanionAppBundleIdentifier</key>
+	<string>$(APP_BUNDLE_IDENTIFIER)</string>
 	<key>WKWatchKitApp</key>
 	<true/>
 </dict>
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -265,10 +265,9 @@ Future<XcodeBuildResult> buildXcodeProject({
 
   // Check if the project contains a watchOS companion app.
   final bool hasWatchCompanion = await app.project.containsWatchCompanion(
-    targets: projectInfo.targets,
-    schemes: projectInfo.schemes,
-    buildInfo: buildInfo,
-    deviceId: deviceID,
+    projectInfo.targets,
+    buildInfo,
+    deviceID,
   );
   if (hasWatchCompanion) {
     // The -sdk argument has to be omitted if a watchOS companion app exists.
diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
@@ -198,11 +198,7 @@ class XcodeProjectInterpreter {
       if (buildContext.environmentType == EnvironmentType.simulator)
         ...<String>['-sdk', 'iphonesimulator'],
       '-destination',
-      if (buildContext.isWatch == true && buildContext.environmentType == EnvironmentType.physical)
-        'generic/platform=watchOS'
-      else if (buildContext.isWatch == true)
-        'generic/platform=watchOS Simulator'
-      else if (deviceId != null)
+      if (deviceId != null)
         'id=$deviceId'
       else if (buildContext.environmentType == EnvironmentType.physical)
         'generic/platform=iOS'
@@ -380,14 +376,12 @@ class XcodeProjectBuildContext {
     this.configuration,
     this.environmentType = EnvironmentType.physical,
     this.deviceId,
-    this.isWatch = false,
   });
 
   final String? scheme;
   final String? configuration;
   final EnvironmentType environmentType;
   final String? deviceId;
-  final bool isWatch;
 
   @override
   int get hashCode => Object.hash(scheme, configuration, environmentType, deviceId);
@@ -401,8 +395,7 @@ class XcodeProjectBuildContext {
         other.scheme == scheme &&
         other.configuration == configuration &&
         other.deviceId == deviceId &&
-        other.environmentType == environmentType &&
-        other.isWatch == isWatch;
+        other.environmentType == environmentType;
   }
 }
 
diff --git a/packages/flutter_tools/lib/src/xcode_project.dart b/packages/flutter_tools/lib/src/xcode_project.dart
@@ -256,8 +256,6 @@ class IosProject extends XcodeBasedProject {
     BuildInfo? buildInfo, {
     EnvironmentType environmentType = EnvironmentType.physical,
     String? deviceId,
-    String? scheme,
-    bool isWatch = false,
   }) async {
     if (!existsSync()) {
       return null;
@@ -267,11 +265,9 @@ class IosProject extends XcodeBasedProject {
       return null;
     }
 
+    final String? scheme = info.schemeFor(buildInfo);
     if (scheme == null) {
-      scheme = info.schemeFor(buildInfo);
-      if (scheme == null) {
-        info.reportFlavorNotFoundAndExit();
-      }
+      info.reportFlavorNotFoundAndExit();
     }
 
     final String? configuration = (await projectInfo())?.buildConfigurationFor(
@@ -283,7 +279,6 @@ class IosProject extends XcodeBasedProject {
       scheme: scheme,
       configuration: configuration,
       deviceId: deviceId,
-      isWatch: isWatch,
     );
     final Map<String, String>? currentBuildSettings = _buildSettingsByBuildContext[buildContext];
     if (currentBuildSettings == null) {
@@ -332,12 +327,7 @@ class IosProject extends XcodeBasedProject {
   }
 
   /// Check if one the [targets] of the project is a watchOS companion app target.
-  Future<bool> containsWatchCompanion({
-    required List<String> targets,
-    required List<String> schemes,
-    required BuildInfo buildInfo,
-    String? deviceId,
-  }) async {
+  Future<bool> containsWatchCompanion(List<String> targets, BuildInfo buildInfo, String? deviceId) async {
     final String? bundleIdentifier = await productBundleIdentifier(buildInfo);
     // A bundle identifier is required for a companion app.
     if (bundleIdentifier == null) {
@@ -346,8 +336,8 @@ class IosProject extends XcodeBasedProject {
     for (final String target in targets) {
       // Create Info.plist file of the target.
       final File infoFile = hostAppRoot.childDirectory(target).childFile('Info.plist');
-      // In older versions of Xcode, if the target was a watchOS companion app,
-      // the Info.plist file of the target contained the key WKCompanionAppBundleIdentifier.
+      // The Info.plist file of a target contains the key WKCompanionAppBundleIdentifier,
+      // if it is a watchOS companion app.
       if (infoFile.existsSync()) {
         final String? fromPlist = globals.plistParser.getStringValueFromFile(infoFile.path, 'WKCompanionAppBundleIdentifier');
         if (bundleIdentifier == fromPlist) {
@@ -367,34 +357,6 @@ class IosProject extends XcodeBasedProject {
         }
       }
     }
-
-    // If key not found in Info.plist above, do more expensive check of build settings.
-    // In newer versions of Xcode, the build settings of the watchOS companion
-    // app's scheme should contain the key INFOPLIST_KEY_WKCompanionAppBundleIdentifier.
-    final bool watchIdentifierFound = xcodeProjectInfoFile.readAsStringSync().contains('WKCompanionAppBundleIdentifier');
-    if (watchIdentifierFound == false) {
-      return false;
-    }
-    for (final String scheme in schemes) {
-      final Map<String, String>? allBuildSettings = await buildSettingsForBuildInfo(
-        buildInfo,
-        deviceId: deviceId,
-        scheme: scheme,
-        isWatch: true,
-      );
-      if (allBuildSettings != null) {
-        final String? fromBuild = allBuildSettings['INFOPLIST_KEY_WKCompanionAppBundleIdentifier'];
-        if (bundleIdentifier == fromBuild) {
-          return true;
-        }
-        if (fromBuild != null && fromBuild.contains(r'$')) {
-          final String substitutedVariable = substituteXcodeVariables(fromBuild, allBuildSettings);
-          if (substitutedVariable == bundleIdentifier) {
-            return true;
-          }
-        }
-      }
-    }
     return false;
   }
 
diff --git a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
@@ -395,76 +395,6 @@ void main() {
     ProcessManager: () => FakeProcessManager.any(),
   });
 
-  testUsingContext('build settings uses watch destination if isWatch is true', () async {
-    platform.environment = const <String, String>{};
-
-    fakeProcessManager.addCommands(<FakeCommand>[
-      kWhichSysctlCommand,
-      kx64CheckCommand,
-      FakeCommand(
-        command: <String>[
-          'xcrun',
-          'xcodebuild',
-          '-project',
-          '/',
-          '-destination',
-          'generic/platform=watchOS',
-          '-showBuildSettings',
-          'BUILD_DIR=${fileSystem.path.absolute('build', 'ios')}',
-        ],
-        exitCode: 1,
-      ),
-    ]);
-
-    expect(
-      await xcodeProjectInterpreter.getBuildSettings(
-        '',
-        buildContext: const XcodeProjectBuildContext(isWatch: true),
-      ),
-      const <String, String>{},
-    );
-    expect(fakeProcessManager, hasNoRemainingExpectations);
-  }, overrides: <Type, Generator>{
-    FileSystem: () => fileSystem,
-    ProcessManager: () => FakeProcessManager.any(),
-  });
-
-  testUsingContext('build settings uses watch simulator destination if isWatch is true and environment type is simulator', () async {
-    platform.environment = const <String, String>{};
-
-    fakeProcessManager.addCommands(<FakeCommand>[
-      kWhichSysctlCommand,
-      kx64CheckCommand,
-      FakeCommand(
-        command: <String>[
-          'xcrun',
-          'xcodebuild',
-          '-project',
-          '/',
-          '-sdk',
-          'iphonesimulator',
-          '-destination',
-          'generic/platform=watchOS Simulator',
-          '-showBuildSettings',
-          'BUILD_DIR=${fileSystem.path.absolute('build', 'ios')}',
-        ],
-        exitCode: 1,
-      ),
-    ]);
-
-    expect(
-      await xcodeProjectInterpreter.getBuildSettings(
-        '',
-        buildContext: const XcodeProjectBuildContext(environmentType: EnvironmentType.simulator, isWatch: true),
-      ),
-      const <String, String>{},
-    );
-    expect(fakeProcessManager, hasNoRemainingExpectations);
-  }, overrides: <Type, Generator>{
-    FileSystem: () => fileSystem,
-    ProcessManager: () => FakeProcessManager.any(),
-  });
-
   testWithoutContext('xcodebuild clean contains Flutter Xcode environment variables', () async {
     platform.environment = const <String, String>{
       'FLUTTER_XCODE_CODE_SIGN_STYLE': 'Manual',
diff --git a/packages/flutter_tools/test/general.shard/project_test.dart b/packages/flutter_tools/test/general.shard/project_test.dart
