diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index 30bf51be26..3c9b50eb15 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -15,10 +15,6 @@ Future main() async { await task(() async { final Directory tempDir = Directory.systemTemp.createTempSync('flutter_plugin_test.'); try { - section('Use CocoaPods'); - - await flutter('config', options: ['--no-enable-swift-package-manager']); - section('Lint integration_test'); await inDirectory(tempDir, () async { diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart index e53465397c..c0258340b8 100644 --- a/packages/flutter_tools/lib/src/features.dart +++ b/packages/flutter_tools/lib/src/features.dart @@ -52,7 +52,7 @@ abstract class FeatureFlags { bool get isPreviewDeviceEnabled => true; /// Whether Swift Package Manager dependency management is enabled. - bool get isSwiftPackageManagerEnabled => true; + bool get isSwiftPackageManagerEnabled => false; /// Whether apps are automatically migrated to add Swift Package Manager /// integration. Requires [isSwiftPackageManagerEnabled]. @@ -174,10 +174,13 @@ const Feature previewDevice = Feature( ); /// Enable Swift Package Manager as a darwin dependency manager. -const Feature swiftPackageManager = Feature.fullyEnabled( +const Feature swiftPackageManager = Feature( name: 'support for Swift Package Manager for iOS and macOS', configSetting: 'enable-swift-package-manager', environmentOverride: 'FLUTTER_SWIFT_PACKAGE_MANAGER', + master: FeatureChannelSetting(available: true), + beta: FeatureChannelSetting(available: true), + stable: FeatureChannelSetting(available: true), ); /// Enable migrating iOS and macOS apps to add Swift Package Manager integration. diff --git a/packages/flutter_tools/test/general.shard/features_test.dart b/packages/flutter_tools/test/general.shard/features_test.dart index 81e92c9128..9ef0b675d5 100644 --- a/packages/flutter_tools/test/general.shard/features_test.dart +++ b/packages/flutter_tools/test/general.shard/features_test.dart @@ -410,12 +410,12 @@ void main() { group('Swift Package Manager feature', () { testWithoutContext('availability and default enabled', () { - expect(swiftPackageManager.master.enabledByDefault, isTrue); - expect(swiftPackageManager.master.available, isTrue); - expect(swiftPackageManager.beta.enabledByDefault, isTrue); - expect(swiftPackageManager.beta.available, isTrue); - expect(swiftPackageManager.stable.enabledByDefault, isTrue); - expect(swiftPackageManager.stable.available, isTrue); + expect(swiftPackageManager.master.enabledByDefault, false); + expect(swiftPackageManager.master.available, true); + expect(swiftPackageManager.beta.enabledByDefault, false); + expect(swiftPackageManager.beta.available, true); + expect(swiftPackageManager.stable.enabledByDefault, false); + expect(swiftPackageManager.stable.available, true); }); testWithoutContext('can be enabled', () { @@ -427,12 +427,12 @@ void main() { group('Swift Package Manager app migration feature', () { testWithoutContext('availability and default enabled', () { - expect(swiftPackageManagerMigration.master.enabledByDefault, isFalse); - expect(swiftPackageManagerMigration.master.available, isTrue); - expect(swiftPackageManagerMigration.beta.enabledByDefault, isFalse); - expect(swiftPackageManagerMigration.beta.available, isTrue); - expect(swiftPackageManagerMigration.stable.enabledByDefault, isFalse); - expect(swiftPackageManagerMigration.stable.available, isTrue); + expect(swiftPackageManagerMigration.master.enabledByDefault, false); + expect(swiftPackageManagerMigration.master.available, true); + expect(swiftPackageManagerMigration.beta.enabledByDefault, false); + expect(swiftPackageManagerMigration.beta.available, true); + expect(swiftPackageManagerMigration.stable.enabledByDefault, false); + expect(swiftPackageManagerMigration.stable.available, true); }); testWithoutContext('requires Swift Package Manager feature', () {