From 2c44f4a68bc8df7bbdb4055151c32e176eba1882 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 15 Nov 2022 13:35:29 -0800 Subject: [PATCH] Remove dev branch reference from build ios-frameworks error (#115166) --- .../lib/src/commands/build_ios_framework.dart | 2 +- .../lib/src/commands/build_macos_framework.dart | 2 +- .../hermetic/build_darwin_framework_test.dart | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/flutter_tools/lib/src/commands/build_ios_framework.dart b/packages/flutter_tools/lib/src/commands/build_ios_framework.dart index 64fa2105904..31ae2b6034d 100644 --- a/packages/flutter_tools/lib/src/commands/build_ios_framework.dart +++ b/packages/flutter_tools/lib/src/commands/build_ios_framework.dart @@ -318,7 +318,7 @@ class BuildIOSFrameworkCommand extends BuildFrameworkCommand { final GitTagVersion gitTagVersion = flutterVersion.gitTagVersion; if (!force && (gitTagVersion.x == null || gitTagVersion.y == null || gitTagVersion.z == null || gitTagVersion.commits != 0)) { throwToolExit( - '--cocoapods is only supported on the dev, beta, or stable channels. Detected version is ${flutterVersion.frameworkVersion}'); + '--cocoapods is only supported on the beta or stable channel. Detected version is ${flutterVersion.frameworkVersion}'); } // Podspecs use semantic versioning, which don't support hotfixes. diff --git a/packages/flutter_tools/lib/src/commands/build_macos_framework.dart b/packages/flutter_tools/lib/src/commands/build_macos_framework.dart index fce9021e684..b36ae0fd68e 100644 --- a/packages/flutter_tools/lib/src/commands/build_macos_framework.dart +++ b/packages/flutter_tools/lib/src/commands/build_macos_framework.dart @@ -129,7 +129,7 @@ class BuildMacOSFrameworkCommand extends BuildFrameworkCommand { gitTagVersion.z == null || gitTagVersion.commits != 0)) { throwToolExit( - '--cocoapods is only supported on the dev, beta, or stable channels. Detected version is ${flutterVersion.frameworkVersion}'); + '--cocoapods is only supported on the beta or stable channel. Detected version is ${flutterVersion.frameworkVersion}'); } // Podspecs use semantic versioning, which don't support hotfixes. diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_darwin_framework_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_darwin_framework_test.dart index fc68cf78319..5b84d3f6592 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/build_darwin_framework_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/build_darwin_framework_test.dart @@ -76,7 +76,7 @@ void main() { ); expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory), - throwsToolExit(message: 'Detected version is $frameworkVersion')); + throwsToolExit(message: '--cocoapods is only supported on the beta or stable channel. Detected version is $frameworkVersion')); }, overrides: { FileSystem: () => memoryFileSystem, ProcessManager: () => FakeProcessManager.any(), @@ -106,7 +106,7 @@ void main() { ); expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory), - throwsToolExit(message: 'Detected version is $frameworkVersion')); + throwsToolExit(message: '--cocoapods is only supported on the beta or stable channel. Detected version is $frameworkVersion')); }, overrides: { FileSystem: () => memoryFileSystem, ProcessManager: () => FakeProcessManager.any(), @@ -313,7 +313,7 @@ void main() { ); expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory), - throwsToolExit(message: 'Detected version is $frameworkVersion')); + throwsToolExit(message: '--cocoapods is only supported on the beta or stable channel. Detected version is $frameworkVersion')); }, overrides: { FileSystem: () => memoryFileSystem, ProcessManager: () => FakeProcessManager.any(), @@ -343,7 +343,7 @@ void main() { ); expect(() => command.produceFlutterPodspec(BuildMode.debug, outputDirectory), - throwsToolExit(message: 'Detected version is $frameworkVersion')); + throwsToolExit(message: '--cocoapods is only supported on the beta or stable channel. Detected version is $frameworkVersion')); }, overrides: { FileSystem: () => memoryFileSystem, ProcessManager: () => FakeProcessManager.any(),