diff --git a/README.md b/README.md index ba40497..70dc8fc 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ package_rename_config: ios: app_name: # (String) The display name of the ios app bundle_name: # (String) The bundle name of the ios app + override_old_package: # (String) Use this to replace the old bundle identifier with the new bundle identifier package_name: # (String) The product bundle identifier of the ios app linux: diff --git a/example/example.md b/example/example.md index 876cfed..a14e396 100644 --- a/example/example.md +++ b/example/example.md @@ -5,12 +5,13 @@ package_rename_config: android: app_name: Package Rename Demo package_name: rocks.outdatedguy.packagerenamedemo - override_old_package: com.example.example + override_old_package: com.example.package_rename_example lang: kotlin ios: app_name: Package Rename Demo bundle_name: renamedemo + override_old_package: com.example.packageRenameExample package_name: rocks.outdatedguy.packagerenamedemo web: diff --git a/example/package_rename_config.yaml b/example/package_rename_config.yaml index c94b61d..3df9286 100644 --- a/example/package_rename_config.yaml +++ b/example/package_rename_config.yaml @@ -8,6 +8,7 @@ package_rename_config: ios: app_name: Package Rename Demo bundle_name: renamedemo + override_old_package: com.example.packageRenameExample package_name: rocks.outdatedguy.packagerenamedemo web: diff --git a/example/pubspec.lock b/example/pubspec.lock index fa5f288..1bbad23 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -134,10 +134,10 @@ packages: dependency: transitive description: name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.1.4" yaml: dependency: transitive description: diff --git a/lib/platforms/ios.dart b/lib/platforms/ios.dart index 1914109..760d27a 100644 --- a/lib/platforms/ios.dart +++ b/lib/platforms/ios.dart @@ -9,7 +9,10 @@ void _setIOSConfigurations(dynamic iosConfig) { _setIOSDisplayName(iosConfigMap[_appNameKey]); _setIOSBundleName(iosConfigMap[_bundleNameKey]); - _setIOSPackageName(iosConfigMap[_packageNameKey]); + _setIOSPackageName( + oldPackageName: iosConfigMap[_overrideOldPackageKey], + packageName: iosConfigMap[_packageNameKey], + ); } on _PackageRenameException catch (e) { _logger ..e('${e.message}ERR Code: ${e.code}') @@ -96,7 +99,10 @@ void _setIOSBundleName(dynamic bundleName) { } } -void _setIOSPackageName(dynamic packageName) { +void _setIOSPackageName({ + dynamic oldPackageName, + dynamic packageName, +}) { try { if (packageName == null) return; if (packageName is! String) throw _PackageRenameErrors.invalidPackageName; @@ -111,26 +117,25 @@ void _setIOSPackageName(dynamic packageName) { // Replaces old bundle id from // `PRODUCT_BUNDLE_IDENTIFIER = {{BUNDLE_ID}};` .replaceAll( - RegExp( - r'PRODUCT_BUNDLE_IDENTIFIER = ([A-Za-z0-9.-_]+)(?