From 563fb0c743aa0c78a13e8b21253b4586fa7c19a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Sharma?= <737941+loic-sharma@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:03:30 -0800 Subject: [PATCH] [SwiftPM] Simplify logic that determines if CocoaPods is used (#158409) This is a refactoring with no semantic changes. I will get a text exemption. Part of https://github.com/flutter/flutter/issues/151567 --- .../macos/darwin_dependency_management.dart | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/packages/flutter_tools/lib/src/macos/darwin_dependency_management.dart b/packages/flutter_tools/lib/src/macos/darwin_dependency_management.dart index af1cebe54e..c681308743 100644 --- a/packages/flutter_tools/lib/src/macos/darwin_dependency_management.dart +++ b/packages/flutter_tools/lib/src/macos/darwin_dependency_management.dart @@ -90,11 +90,7 @@ class DarwinDependencyManagement { final bool useCocoapods; if (_project.usesSwiftPackageManager) { - useCocoapods = _usingCocoaPodsPlugin( - pluginCount: totalCount, - swiftPackageCount: swiftPackageCount, - cocoapodCount: podCount, - ); + useCocoapods = swiftPackageCount < totalCount; } else { // When Swift Package Manager is not enabled, set up Podfile if plugins // is not empty, regardless of if plugins are CocoaPod compatible. This @@ -112,19 +108,6 @@ class DarwinDependencyManagement { } } - bool _usingCocoaPodsPlugin({ - required int pluginCount, - required int swiftPackageCount, - required int cocoapodCount, - }) { - if (_project.usesSwiftPackageManager) { - if (pluginCount == swiftPackageCount) { - return false; - } - } - return cocoapodCount > 0; - } - /// Returns count of total number of plugins, number of Swift Package Manager /// compatible plugins, and number of CocoaPods compatible plugins. A plugin /// can be both Swift Package Manager and CocoaPods compatible.