Merge pull request #10158 from dnkoutso/bump_xcodeproj119

Bump minimum version of Xcodeproj to 1.19.0
CocoaPods · Oct 20, 2020 · c73d4eb · c73d4eb
2 parents 6a4047b + b3ae4b1
commit c73d4eb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -37,10 +37,10 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: fe1ce4f4f6d37d227409da1574eb42163581eb06
+  revision: 84e5be06886829b90b6cd12e45a21d1cdbe8f448
   branch: master
   specs:
-    xcodeproj (1.18.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -125,7 +125,7 @@ PATH
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.17.0, < 2.0)
+      xcodeproj (>= 1.19.0, < 2.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/cocoapods.gemspec b/cocoapods.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'cocoapods-trunk',       '>= 1.4.0', '< 2.0'
   s.add_runtime_dependency 'cocoapods-try',         '>= 1.1.0', '< 2.0'
   s.add_runtime_dependency 'molinillo',             '~> 0.6.6'
-  s.add_runtime_dependency 'xcodeproj',             '>= 1.17.0', '< 2.0'
+  s.add_runtime_dependency 'xcodeproj',             '>= 1.19.0', '< 2.0'
 
   s.add_runtime_dependency 'colored2',       '~> 3.1'
   s.add_runtime_dependency 'escape',        '~> 0.0.4'

diff --git a/lib/cocoapods/installer/xcode/pods_project_generator/app_host_installer.rb b/lib/cocoapods/installer/xcode/pods_project_generator/app_host_installer.rb
@@ -79,7 +79,11 @@ def install!
             app_host_target.build_configurations.each do |configuration|
               configuration.build_settings['PRODUCT_NAME'] = app_target_label
               configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
-              configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if platform == :osx
+              if platform == :osx
+                configuration.build_settings['CODE_SIGN_IDENTITY'] = ''
+              elsif platform == :ios
+                configuration.build_settings['CODE_SIGN_IDENTITY'] = 'iPhone Developer'
+              end
               configuration.build_settings['CURRENT_PROJECT_VERSION'] = '1'
             end
 

diff --git a/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb b/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
@@ -408,7 +408,11 @@ def add_test_targets
                   configuration.build_settings['CODE_SIGNING_ALLOWED'] = 'YES'
                 end
                 # For macOS we do not code sign the XCTest bundle because we do not code sign the frameworks either.
-                configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if target.platform == :osx
+                if target.platform == :osx
+                  configuration.build_settings['CODE_SIGN_IDENTITY'] = ''
+                elsif target.platform == :ios
+                  configuration.build_settings['CODE_SIGN_IDENTITY'] = 'iPhone Developer'
+                end
               end
 
               remove_pod_target_xcconfig_overrides_from_target(target.test_spec_build_settings_by_config[test_spec.name], test_native_target)

diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs