fix: correctly merge IPHONEOS_DEPLOYMENT_TARGET in xcconfigs (#5728)

NativeScript · Apr 12, 2023 · e6c09c0 · e6c09c0
1 parent c35673e
commit e6c09c0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/services/xcconfig-service.ts b/lib/services/xcconfig-service.ts
@@ -42,7 +42,13 @@ export class XcconfigService implements IXcconfigService {
 		const escapedDestinationFile = destinationFile.replace(/'/g, "\\'");
 		const escapedSourceFile = sourceFile.replace(/'/g, "\\'");
 
-		const mergeScript = `require 'xcodeproj'; Xcodeproj::Config.new('${escapedDestinationFile}').merge(Xcodeproj::Config.new('${escapedSourceFile}')).save_as(Pathname.new('${escapedDestinationFile}'))`;
+		const mergeScript = `require 'xcodeproj';
+		sourceConfig = Xcodeproj::Config.new('${escapedDestinationFile}')
+		targetConfig = Xcodeproj::Config.new('${escapedSourceFile}')
+		if(sourceConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET') && targetConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET'))
+			sourceConfig.attributes.delete('IPHONEOS_DEPLOYMENT_TARGET')
+		end
+		sourceConfig.merge(targetConfig).save_as(Pathname.new('${escapedDestinationFile}'))`;
 		await this.$childProcess.exec(`ruby -e "${mergeScript}"`);
 	}