cocoapods 1.11.0.beta.2 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb329667c5428edaa84a9f21d4545285f7946264581b884c1d1f6387fd0cb570
-  data.tar.gz: 2d0887f1665eda88c26ba2e2350b58623f381123e0487da7f120854cfbd053dd
+  metadata.gz: 931de41ff6f73552f6df94fe1f181116e93e675d3ea19455ac9487916c398bb5
+  data.tar.gz: e003ee69f4eb100152140a48685d9da44f48adb2081ff0fa1174a209efdd5d74
 SHA512:
-  metadata.gz: 821686e3f37164465545f59f337f90e28bee70c4002dab29ee85a072bff82ee1c3e57cf580638ac6b8f20d628f209940818a8adc2c397fd221bdaeac67a3f4d1
-  data.tar.gz: e39c20a0f708ec54aa4bc0f92610e7dda998628ae660e6a09d5c1bed072ecde3b5a8a5a696191083d62136b00fc11c42cb85c99b7aadb2811a314a70fcca4753
+  metadata.gz: bc23958f427a0bcccdc959d7a92e3f50e6ff40fb5e4d34c8a6d25b678baa082aa300d70a2c8e0e99d32372cd1c2a87ae1d128571edd6aaa57ca76072d7baa617
+  data.tar.gz: a5379c8993a55018a63fc95167380691f2e3c3ed5ae9ba0ca53974064cd30606ff098b5b79a2f06d3ac81bb763aa9ca9ba499756461785be1955a54a917cf421

data/CHANGELOG.md

@@ -4,6 +4,64 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.11.2 (2021-09-13)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Do not validate modular header dependencies for pre-built Swift pods.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10912](https://github.com/CocoaPods/CocoaPods/issues/10912)
+
+
+## 1.11.1 (2021-09-13)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Handle spec repo urls with user info when determining if they are CDN.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10941](https://github.com/CocoaPods/CocoaPods/issues/10941)
+
+* Set `INFOPLIST_FILE` build setting to `$(SRCROOT)/App/App-Info.plist` during lint.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10927](https://github.com/CocoaPods/CocoaPods/issues/10927)
+
+* Set `PRODUCT_BUNDLE_IDENTIFIER` for generated app during lint.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10933](https://github.com/CocoaPods/CocoaPods/issues/10933)
+
+
+## 1.11.0 (2021-09-01)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* None.  
+
+
+## 1.11.0.rc.1 (2021-08-25)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Correctly process multiple `xcframeworks` a pod provides.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10378](https://github.com/CocoaPods/CocoaPods/issues/10378)
+
+
 ## 1.11.0.beta.2 (2021-08-11)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.11.0.beta.2'.freeze unless defined? Pod::VERSION
+  VERSION = '1.11.2'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/copy_xcframework_script.rb

@@ -70,8 +70,8 @@ copy_dir()
   local destination="$2"
 
   # Use filter instead of exclude so missing patterns don't throw errors.
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}\\" \\"${destination}\\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}" "${destination}"
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}*\\" \\"${destination}\\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}"
 }
 
 SELECT_SLICE_RETVAL=""
@@ -130,38 +130,11 @@ select_slice() {
   done
 }
 
-install_library() {
-  local source="$1"
-  local name="$2"
-  local destination="#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/${name}"
-
-  # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-
-  local source="$binary"
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}/*\\" \\"${destination}\\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}/*" "${destination}"
-}
-
-# Copies a framework to derived data for use in later build phases
-install_framework()
-{
-  local source="$1"
-  local name="$2"
-  local destination="#{Pod::Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/${name}"
-
-  if [ ! -d "$destination" ]; then
-    mkdir -p "$destination"
-  fi
-
-  copy_dir "$source" "$destination"
-  echo "Copied $source to $destination"
-}
-
 install_xcframework() {
   local basepath="$1"
   local name="$2"
   local package_type="$3"
-  local paths=("${@:3}")
+  local paths=("${@:4}")
 
   # Locate the correct slice of the .xcframework for the current architectures
   select_slice "${paths[@]}"
@@ -179,7 +152,6 @@ install_xcframework() {
   fi
 
   copy_dir "$source/" "$destination"
-
   echo "Copied $source to $destination"
 }
 

data/lib/cocoapods/installer/xcode/pods_project_generator/app_host_installer.rb

@@ -62,7 +62,8 @@ module Pod
           # @param [Hash] info_plist_entries see #info_plist_entries
           # @param [String] product_basename see #product_basename
           #
-          def initialize(sandbox, project, platform, subgroup_name, group_name, app_target_label, add_main: true, add_launchscreen_storyboard: platform == :ios, info_plist_entries: {}, product_basename: nil)
+          def initialize(sandbox, project, platform, subgroup_name, group_name, app_target_label, add_main: true,
+                         add_launchscreen_storyboard: platform == :ios, info_plist_entries: {}, product_basename: nil)
             @sandbox = sandbox
             @project = project
             @platform = platform

data/lib/cocoapods/installer/xcode/pods_project_generator/target_installer_helper.rb

@@ -48,17 +48,23 @@ module Pod
           #  @param [Hash] additional_entries
           #         any additional entries to include in this Info.plist file.
           #
+          # @param [String] build_setting_value
+          #         an optional value to set for the `INFOPLIST_FILE` build setting on the
+          #         native target. If none is specified then the value is calculated from the
+          #         Info.plist path relative to the sandbox root.
+          #
           # @return [void]
           #
           def create_info_plist_file_with_sandbox(sandbox, path, native_target, version, platform,
-                                                  bundle_package_type = :fmwk, additional_entries: {})
+                                                  bundle_package_type = :fmwk, additional_entries: {},
+                                                  build_setting_value: nil)
             UI.message "- Generating Info.plist file at #{UI.path(path)}" do
               generator = Generator::InfoPlistFile.new(version, platform, bundle_package_type, additional_entries)
               update_changed_file(generator, path)
 
-              relative_path_string = path.relative_path_from(sandbox.root).to_s
+              build_setting_value ||= path.relative_path_from(sandbox.root).to_s
               native_target.build_configurations.each do |c|
-                c.build_settings['INFOPLIST_FILE'] = relative_path_string
+                c.build_settings['INFOPLIST_FILE'] = build_setting_value
               end
             end
           end

data/lib/cocoapods/installer/xcode/target_validator.rb

@@ -129,7 +129,7 @@ module Pod
         def verify_swift_pods_have_module_dependencies
           error_messages = []
           pod_targets.each do |pod_target|
-            next unless pod_target.uses_swift?
+            next unless pod_target.uses_swift? && pod_target.should_build?
 
             non_module_dependencies = []
             pod_target.dependent_targets.each do |dependent_target|

data/lib/cocoapods/sources_manager.rb

@@ -71,12 +71,15 @@ module Pod
       #         The URL of the source.
       #
       def cdn_url?(url)
-        return unless url =~ %r{^https?:\/\/}
+        return false unless url =~ %r{^https?:\/\/}
 
         uri_options = {}
 
         netrc_info = Netrc.read
-        netrc_host = URI.parse(url).host
+        uri = URI.parse(url)
+        return false unless uri.userinfo.nil?
+
+        netrc_host = uri.host
         credentials = netrc_info[netrc_host]
         uri_options[:http_basic_authentication] = credentials if credentials
 

data/lib/cocoapods/validator.rb

@@ -583,12 +583,21 @@ module Pod
       app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
       sandbox = Sandbox.new(config.sandbox_root)
       info_plist_path = app_project.path.dirname.+('App/App-Info.plist')
-      Pod::Installer::Xcode::PodsProjectGenerator::TargetInstallerHelper.create_info_plist_file_with_sandbox(sandbox, info_plist_path, app_target, '1.0.0', Platform.new(consumer.platform_name), :appl)
+      Pod::Installer::Xcode::PodsProjectGenerator::TargetInstallerHelper.create_info_plist_file_with_sandbox(sandbox,
+                                                                                                             info_plist_path,
+                                                                                                             app_target,
+                                                                                                             '1.0.0',
+                                                                                                             Platform.new(consumer.platform_name),
+                                                                                                             :appl,
+                                                                                                             :build_setting_value => '$(SRCROOT)/App/App-Info.plist')
       Pod::Generator::AppTargetHelper.add_swift_version(app_target, derived_swift_version)
-      # Lint will fail if a AppIcon is set but no image is found with such name
-      # Happens only with Static Frameworks enabled but shouldn't be set anyway
       app_target.build_configurations.each do |config|
+        # Lint will fail if a AppIcon is set but no image is found with such name
+        # Happens only with Static Frameworks enabled but shouldn't be set anyway
         config.build_settings.delete('ASSETCATALOG_COMPILER_APPICON_NAME')
+        # Ensure this is set generally but we have seen an issue with ODRs:
+        # see: https://github.com/CocoaPods/CocoaPods/issues/10933
+        config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
       end
       app_project.save
       app_project.recreate_user_schemes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.11.0.beta.2
+  version: 1.11.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0.beta.2
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0.beta.2
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -541,11 +541,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: The Cocoa library package manager.