File tree 1 file changed +7
-1
lines changed
1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -42,7 +42,13 @@ export class XcconfigService implements IXcconfigService {
42
42
const escapedDestinationFile = destinationFile . replace ( / ' / g, "\\'" ) ;
43
43
const escapedSourceFile = sourceFile . replace ( / ' / g, "\\'" ) ;
44
44
45
- const mergeScript = `require 'xcodeproj'; Xcodeproj::Config.new('${ escapedDestinationFile } ').merge(Xcodeproj::Config.new('${ escapedSourceFile } ')).save_as(Pathname.new('${ escapedDestinationFile } '))` ;
45
+ const mergeScript = `require 'xcodeproj';
46
+ sourceConfig = Xcodeproj::Config.new('${ escapedDestinationFile } ')
47
+ targetConfig = Xcodeproj::Config.new('${ escapedSourceFile } ')
48
+ if(sourceConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET') && targetConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET'))
49
+ sourceConfig.attributes.delete('IPHONEOS_DEPLOYMENT_TARGET')
50
+ end
51
+ sourceConfig.merge(targetConfig).save_as(Pathname.new('${ escapedDestinationFile } '))` ;
46
52
await this . $childProcess . exec ( `ruby -e "${ mergeScript } "` ) ;
47
53
}
48
54
You can’t perform that action at this time.
0 commit comments