diff --git a/packages/flutter_tools/lib/src/isolated/native_assets/macos/native_assets_host.dart b/packages/flutter_tools/lib/src/isolated/native_assets/macos/native_assets_host.dart index b0bfb0e7e7c..9f3c42521d8 100644 --- a/packages/flutter_tools/lib/src/isolated/native_assets/macos/native_assets_host.dart +++ b/packages/flutter_tools/lib/src/isolated/native_assets/macos/native_assets_host.dart @@ -165,9 +165,6 @@ Future cCompilerConfigMacOS() async { /// (A–Z, a–z, and 0–9), hyphens (-), and periods (.). /// https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleidentifier /// -/// This name can contain up to 15 characters. -/// https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundlename -/// /// The [alreadyTakenNames] are used to ensure that the framework name does not /// conflict with previously chosen names. Uri frameworkUri(String fileName, Set alreadyTakenNames) { @@ -185,13 +182,7 @@ Uri frameworkUri(String fileName, Set alreadyTakenNames) { fileName = fileName.replaceFirst('lib', ''); } fileName = fileName.replaceAll(RegExp(r'[^A-Za-z0-9_-]'), ''); - if (fileName.length > 15) { - fileName = fileName.substring(0, 15); - } if (alreadyTakenNames.contains(fileName)) { - if (fileName.length > 12) { - fileName = fileName.substring(0, 12); - } final String prefixName = fileName; for (int i = 1; i < 1000; i++) { fileName = '$prefixName$i'; diff --git a/packages/flutter_tools/test/general.shard/isolated/macos/native_assets_host_test.dart b/packages/flutter_tools/test/general.shard/isolated/macos/native_assets_host_test.dart index ad8898ce1bb..4e1c3b62c88 100644 --- a/packages/flutter_tools/test/general.shard/isolated/macos/native_assets_host_test.dart +++ b/packages/flutter_tools/test/general.shard/isolated/macos/native_assets_host_test.dart @@ -34,7 +34,7 @@ void main() { ); expect( frameworkUri('libatoolongfilenameforaframework.dylib', {}), - equals(Uri.file('atoolongfilenam.framework/atoolongfilenam')), + equals(Uri.file('atoolongfilenameforaframework.framework/atoolongfilenameforaframework')), ); }); @@ -54,15 +54,15 @@ void main() { ); expect( frameworkUri('libatoolongfilenameforaframework.dylib', alreadyTakenNames), - equals(Uri.file('atoolongfilenam.framework/atoolongfilenam')), + equals(Uri.file('atoolongfilenameforaframework.framework/atoolongfilenameforaframework')), ); expect( frameworkUri('libatoolongfilenameforaframework.dylib', alreadyTakenNames), - equals(Uri.file('atoolongfile1.framework/atoolongfile1')), + equals(Uri.file('atoolongfilenameforaframework1.framework/atoolongfilenameforaframework1')), ); expect( frameworkUri('libatoolongfilenameforaframework.dylib', alreadyTakenNames), - equals(Uri.file('atoolongfile2.framework/atoolongfile2')), + equals(Uri.file('atoolongfilenameforaframework2.framework/atoolongfilenameforaframework2')), ); }); } diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart index 505f4fdadc9..eb5f9f1e726 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart @@ -305,7 +305,7 @@ void expectDylibIsBundledMacOS(Directory appDirectory, String buildMode) { // Resources/ // Info.plist // Current -> A - final String frameworkName = packageName.substring(0, 15); + const String frameworkName = packageName; final Directory frameworkDir = frameworksFolder.childDirectory('$frameworkName.framework'); final Directory versionsDir = frameworkDir.childDirectory('Versions'); @@ -330,7 +330,7 @@ void expectDylibIsBundledIos(Directory appDirectory, String buildMode) { expect(appBundle, exists); final Directory frameworksFolder = appBundle.childDirectory('Frameworks'); expect(frameworksFolder, exists); - final String frameworkName = packageName.substring(0, 15); + const String frameworkName = packageName; final File dylib = frameworksFolder .childDirectory('$frameworkName.framework') .childFile(frameworkName); @@ -409,7 +409,7 @@ void expectDylibIsBundledAndroid(Directory appDirectory, String buildMode) { void expectDylibIsBundledWithFrameworks(Directory appDirectory, String buildMode, String os) { final Directory frameworksFolder = appDirectory.childDirectory('build/$os/framework/${buildMode.upperCaseFirst()}'); expect(frameworksFolder, exists); - final String frameworkName = packageName.substring(0, 15); + const String frameworkName = packageName; final File dylib = frameworksFolder .childDirectory('$frameworkName.framework') .childFile(frameworkName);