cocoapods 1.7.0.beta.3 → 1.7.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee8d12451f183094a65d40b6e47d8748aa0fa4eea250c41d9c7a5f482f955b1
-  data.tar.gz: 53769ab0555e4c167f0157a9531d0218b920a005363ac53f838a6e0aba13f844
+  metadata.gz: 643fc24912e72d9f38aaf90853b155a6b5468d5a370e1f97fb31e89b248f200a
+  data.tar.gz: daee7ef9f7178e551ef6e585a7524752c26436e8f70cc98c2ba997786d67cc80
 SHA512:
-  metadata.gz: 3b5533caea792d552f80b53b9003f1929e6ddb730ea85f53b46572fdc2077088df36ddf1d0e9673f7d8b9c647944ec04c025e2f4b3183930598230da1c8f0834
-  data.tar.gz: 4741c555db345c178def609f871abd490ed023dc88c9ee18e32fa7a6fbb01b4d73a1ffd89e94bf9e98917281d3641dcaa7ff1fc614fc61e99ca946b45d451316
+  metadata.gz: 6830b2ef5e87f413426ec1b78cb87b182883c1e910173d9d630a6541f4d00d89e32c5a24ac0dc11ac5fdc63b8a50b7bd8cb8c15dd4bb86d2a671edc3a716995a
+  data.tar.gz: 6684ac7cf04ade56943495ed8f8b860b23340d572275768985b0aa2eca7ad877352bd334ed93981080eb2bf8b9f0ff45ef787af2581b3fd29f96f05d2b4546e2

data/CHANGELOG.md

@@ -4,6 +4,40 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.7.0.rc.1 (2019-05-02)
+
+##### Enhancements
+
+* Replace Pods project `Dependencies` group with `Development Pods` and `Pods` groups.  
+  [Sebastian Shanus](https://github.com/sebastianv1)
+  [#8659](https://github.com/CocoaPods/CocoaPods/issues/8659)
+
+* Add an error message for :podspec pods not matching the version in Pods and on disk  
+  [orta](https://github.com/orta)
+  [#8676](https://github.com/CocoaPods/CocoaPods/issues/8676)
+
+##### Bug Fixes
+
+* Allow insecure loads in requires_app_host's Info.plist  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#8747](https://github.com/CocoaPods/CocoaPods/pull/8747)
+
+* Fix a regression for static libraries with a custom module name  
+  [Eric Amorde](https://github.com/amorde)
+  [#8695](https://github.com/CocoaPods/CocoaPods/issues/8695)
+
+* Fix target cache key SPECS key ordering.  
+  [Sebastian Shanus](https://github.com/sebastianv1)
+  [#8657](https://github.com/CocoaPods/CocoaPods/issues/8657)
+
+* Fix regression not compiling xcdatamodeld files in static frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#8702](https://github.com/CocoaPods/CocoaPods/issues/8702)
+
+* Fix: AppIcon not found when executing `pod lib lint`  
+  [Itay Brenner](https://github.com/itaybre)
+  [#8648](https://github.com/CocoaPods/CocoaPods/issues/8648)
+
 ## 1.7.0.beta.3 (2019-03-28)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/info_plist_file.rb

@@ -94,6 +94,10 @@ module Pod
           output << indent << "</dict>\n"
         when String
           output << indent << "<string>#{value}</string>\n"
+        when true
+          output << indent << "<true/>\n"
+        when false
+          output << indent << "<false/>\n"
         end
         output
       end

data/lib/cocoapods/installer/project_cache/target_cache_key.rb

@@ -74,7 +74,10 @@ module Pod
         def self.from_cache_hash(key_hash)
           cache_hash = key_hash.dup
           if files = cache_hash['FILES']
-            cache_hash['FILES'] = files.sort
+            cache_hash['FILES'] = files.sort_by(&:downcase)
+          end
+          if specs = cache_hash['SPECS']
+            cache_hash['SPECS'] = specs.sort_by(&:downcase)
           end
           type = cache_hash['CHECKSUM'] ? :pod_target : :aggregate
           TargetCacheKey.new(type, cache_hash)
@@ -105,10 +108,10 @@ module Pod
 
           contents = {
             'CHECKSUM' => pod_target.root_spec.checksum,
-            'SPECS' => pod_target.specs.map(&:to_s).sort,
+            'SPECS' => pod_target.specs.map(&:to_s).sort_by(&:downcase),
             'BUILD_SETTINGS_CHECKSUM' => build_settings,
           }
-          contents['FILES'] = pod_target.all_files.sort if is_local_pod
+          contents['FILES'] = pod_target.all_files.sort_by(&:downcase) if is_local_pod
           contents['CHECKOUT_OPTIONS'] = checkout_options if checkout_options
           TargetCacheKey.new(:pod_target, contents)
         end

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

@@ -46,7 +46,9 @@ module Pod
           # the file reference can use so that we only have to call `save` once for all projects.
           project.path.mkpath
           if parent_project
-            parent_project.add_subproject_reference(project, parent_project.dependencies_group)
+            pod_name = pod_name_from_grouping(pod_targets)
+            is_local = sandbox.local?(pod_name)
+            parent_project.add_pod_subproject(project, is_local)
           end
 
           install_file_references(project, pod_targets)
@@ -65,6 +67,13 @@ module Pod
           return {} unless project
           install_aggregate_targets(project, aggregate_targets)
         end
+
+        def pod_name_from_grouping(pod_targets)
+          # The presumption here for multi pods project is that we group by `pod_name`, thus the grouping of `pod_targets`
+          # should share the same `pod_name`.
+          raise '[BUG] Expected at least 1 pod target' if pod_targets.empty?
+          pod_targets.first.pod_name
+        end
       end
     end
   end

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

@@ -182,10 +182,10 @@ module Pod
           pod_target_installation_results_hash = target_installation_results.pod_target_installation_results
           aggregate_target_installation_results_hash = target_installation_results.aggregate_target_installation_results
 
-          AggregateTargetDependencyInstaller.new(aggregate_target_installation_results_hash,
+          AggregateTargetDependencyInstaller.new(sandbox, aggregate_target_installation_results_hash,
                                                  pod_target_installation_results_hash, metadata_cache).install!
 
-          PodTargetDependencyInstaller.new(pod_target_installation_results_hash, metadata_cache).install!
+          PodTargetDependencyInstaller.new(sandbox, pod_target_installation_results_hash, metadata_cache).install!
         end
 
         # @param  [String] pod The root name of the development pod.

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

@@ -18,13 +18,19 @@ module Pod
         #
         attr_reader :metadata_cache
 
+        # @return [Sandbox] The sandbox used for this installation.
+        #
+        attr_reader :sandbox
+
         # Initialize a new instance.
         #
+        # @param [Sandbox] sandbox @see #sandbox
         # @param [Hash{String => TargetInstallationResult}] aggregate_target_installation_results @see #aggregate_target_installation_results
         # @param [Hash{String => TargetInstallationResult}] pod_target_installation_results @see #pod_target_installation_results
         # @param [ProjectMetadataCache] metadata_cache @see #metadata_cache
         #
-        def initialize(aggregate_target_installation_results, pod_target_installation_results, metadata_cache)
+        def initialize(sandbox, aggregate_target_installation_results, pod_target_installation_results, metadata_cache)
+          @sandbox = sandbox
           @aggregate_target_installation_results = aggregate_target_installation_results
           @pod_target_installation_results = pod_target_installation_results
           @metadata_cache = metadata_cache
@@ -51,8 +57,9 @@ module Pod
                 configure_app_extension_api_only_to_native_target(pod_target_native_target) if is_app_extension
               else
                 # Hit the cache
+                is_local = sandbox.local?(pod_target.pod_name)
                 cached_dependency = metadata_cache.target_label_by_metadata[pod_target.label]
-                project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+                project.add_cached_pod_subproject(cached_dependency, is_local)
                 Project.add_cached_dependency(aggregate_native_target, cached_dependency)
               end
             end

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

@@ -74,7 +74,7 @@ module Pod
 
             Pod::Generator::AppTargetHelper.add_app_host_main_file(project, app_host_target, platform_name, @group, app_target_label) if add_main
             Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, deployment_target, app_target_label) if platform == :ios
-            additional_entries = platform == :ios ? ADDITIONAL_IOS_INFO_PLIST_ENTRIES : {}
+            additional_entries = ADDITIONAL_INFO_PLIST_ENTRIES.merge(platform == :ios ? ADDITIONAL_IOS_INFO_PLIST_ENTRIES : {})
             create_info_plist_file_with_sandbox(sandbox, app_host_info_plist_path, app_host_target, '1.0.0', platform,
                                                 :appl, additional_entries)
             @group.new_file(app_host_info_plist_path)
@@ -83,6 +83,12 @@ module Pod
 
           private
 
+          ADDITIONAL_INFO_PLIST_ENTRIES = {
+            'NSAppTransportSecurity' => {
+              'NSAllowsArbitraryLoads' => true,
+            },
+          }.freeze
+
           ADDITIONAL_IOS_INFO_PLIST_ENTRIES = {
             'UILaunchStoryboardName' => 'LaunchScreen',
             'UISupportedInterfaceOrientations' => %w(

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

@@ -14,12 +14,18 @@ module Pod
         #
         attr_reader :metadata_cache
 
+        # @return [Sandbox] The sandbox used for this installation.
+        #
+        attr_reader :sandbox
+
         # Initialize a new instance.
         #
+        # @param [Sandbox] sandbox @see #sandbox
         # @param [TargetInstallationResults] pod_target_installation_results @see #pod_target_installation_results
         # @param [ProjectMetadataCache] metadata_cache @see #metadata_cache
         #
-        def initialize(pod_target_installation_results, metadata_cache)
+        def initialize(sandbox, pod_target_installation_results, metadata_cache)
+          @sandbox = sandbox
           @pod_target_installation_results = pod_target_installation_results
           @metadata_cache = metadata_cache
         end
@@ -68,17 +74,18 @@ module Pod
                                      pod_target_installation_results, metadata_cache, frameworks_group)
           dependent_targets = pod_target.dependent_targets
           dependent_targets.each do |dependent_target|
+            is_local = sandbox.local?(dependent_target.pod_name)
             if installation_result = pod_target_installation_results[dependent_target.name]
               dependent_project = installation_result.native_target.project
               if dependent_project != project
-                project.add_subproject_reference(dependent_project, project.dependencies_group)
+                project.add_pod_subproject(dependent_project, is_local)
               end
               native_target.add_dependency(installation_result.native_target)
               add_framework_file_reference_to_native_target(native_target, pod_target, dependent_target, frameworks_group)
             else
               # Hit the cache
               cached_dependency = metadata_cache.target_label_by_metadata[dependent_target.label]
-              project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+              project.add_cached_pod_subproject(cached_dependency, is_local)
               Project.add_cached_dependency(native_target, cached_dependency)
             end
           end
@@ -93,17 +100,18 @@ module Pod
 
             test_dependent_targets = pod_target.test_dependent_targets_by_spec_name.fetch(test_spec.name, []).unshift(pod_target).uniq
             test_dependent_targets.each do |test_dependent_target|
+              is_local = sandbox.local?(test_dependent_target.pod_name)
               if dependency_installation_result = pod_target_installation_results[test_dependent_target.name]
                 dependent_test_project = dependency_installation_result.native_target.project
                 if dependent_test_project != project
-                  project.add_subproject_reference(dependent_test_project, project.dependencies_group)
+                  project.add_pod_subproject(dependent_test_project, is_local)
                 end
                 test_native_target.add_dependency(dependency_installation_result.native_target)
                 add_framework_file_reference_to_native_target(test_native_target, pod_target, test_dependent_target, frameworks_group)
               else
                 # Hit the cache
                 cached_dependency = metadata_cache.target_label_by_metadata[test_dependent_target.label]
-                project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+                project.add_cached_pod_subproject(cached_dependency, is_local)
                 Project.add_cached_dependency(test_native_target, cached_dependency)
               end
             end
@@ -119,6 +127,7 @@ module Pod
 
             app_dependent_targets = pod_target.app_dependent_targets_by_spec_name.fetch(app_spec.name, []).unshift(pod_target).uniq
             app_dependent_targets.each do |app_dependent_target|
+              is_local = sandbox.local?(app_dependent_target.pod_name)
               if dependency_installation_result = pod_target_installation_results[app_dependent_target.name]
                 resource_bundle_native_targets = dependency_installation_result.app_resource_bundle_targets[app_spec.name]
                 unless resource_bundle_native_targets.nil?
@@ -128,14 +137,14 @@ module Pod
                 end
                 dependency_project = dependency_installation_result.native_target.project
                 if dependency_project != project
-                  project.add_subproject_reference(dependency_project, project.dependencies_group)
+                  project.add_pod_subproject(dependency_project, is_local)
                 end
                 app_native_target.add_dependency(dependency_installation_result.native_target)
                 add_framework_file_reference_to_native_target(app_native_target, pod_target, app_dependent_target, frameworks_group)
               else
                 # Hit the cache
                 cached_dependency = metadata_cache.target_label_by_metadata[app_dependent_target.label]
-                project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+                project.add_cached_pod_subproject(cached_dependency, is_local)
                 Project.add_cached_dependency(native_target, cached_dependency)
               end
             end

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

@@ -303,7 +303,7 @@ module Pod
               other_file_refs = project_file_references_array(other_source_files, 'other source')
               native_target.add_file_references(other_file_refs, nil)
 
-              next unless target.build_as_dynamic_framework?
+              next unless target.build_as_framework?
 
               filter_resource_file_references(file_accessor.resources.flatten) do |compile_phase_refs, resource_phase_refs|
                 native_target.add_file_references(compile_phase_refs, nil)

data/lib/cocoapods/project.rb

@@ -130,6 +130,40 @@ module Pod
       group
     end
 
+    # Creates a new subproject reference for the given project and configures its
+    # group location.
+    #
+    # @param [Project] project
+    #        The subproject to be added.
+    #
+    # @param [Bool] development
+    #        Whether the project should be added to the Development Pods group.
+    #        For projects where `pod_target_subproject` is enabled, all subprojects are added into the Dependencies group.
+    #
+    # @return [PBXFileReference] The new file reference.
+    #
+    def add_pod_subproject(project, development = false)
+      parent_group = group_for_subproject_reference(development)
+      add_subproject_reference(project, parent_group)
+    end
+
+    # Creates a new subproject reference for the given cached metadata and configures its
+    # group location.
+    #
+    # @param [TargetMetadata] metadata
+    #        The project metadata to be added.
+    #
+    # @param [Bool] development
+    #        Whether the project should be added to the Development Pods group.
+    #        For projects where `pod_target_subproject` is enabled, all subprojects are added into the Dependencies group.
+    #
+    # @return [PBXFileReference] The new file reference.
+    #
+    def add_cached_pod_subproject(metadata, development = false)
+      parent_group = group_for_subproject_reference(development)
+      add_cached_subproject_reference(metadata, parent_group)
+    end
+
     # @return [Array<PBXGroup>] Returns all the group of the Pods.
     #
     def pod_groups
@@ -489,6 +523,16 @@ module Pod
       ref
     end
 
+    # Returns the parent group a new subproject reference should belong to.
+    #
+    def group_for_subproject_reference(development)
+      if pod_target_subproject
+        dependencies_group
+      else
+        development ? development_pods : pods
+      end
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

data/lib/cocoapods/resolver.rb

@@ -439,8 +439,14 @@ module Pod
               # Conflict was caused by a requirement from a local dependency.
               # Tell user to use `pod update`.
               o << "\nIt seems like you've changed the constraints of dependency `#{name}` " \
-              "inside your development pod `#{local_pod_parent.name}`.\nYou should run `pod update #{name}` to apply " \
+              "inside your development pod `#{local_pod_parent.name}`.\nYou should run `pod update #{name}` to apply "\
               "changes you've made."
+            elsif !conflict.possibility && conflict.locked_requirement && conflict.locked_requirement.external_source && conflict.locked_requirement.external_source[:podspec] &&
+                                           conflict.requirement && conflict.requirement.external_source && conflict.requirement.external_source[:podspec]
+              # The internal version of the Podspec doesn't match the external definition of a podspec
+              o << "\nIt seems like you've changed the version of the dependency `#{name}` " \
+              "and it differs from the version stored in `Pods/Local Podspecs`.\nYou should run `pod update #{name} --no-repo-update` to apply " \
+              'changes made locally.'
             elsif (conflict.possibility && conflict.possibility.version.prerelease?) &&
                 (conflict.requirement && !(
                 conflict.requirement.prerelease? ||

data/lib/cocoapods/target/pod_target.rb

@@ -150,7 +150,7 @@ module Pod
     # @return [Pathname] the pathname for headers in the sandbox.
     #
     def headers_sandbox
-      Pathname.new(pod_name)
+      Pathname.new(product_module_name)
     end
 
     # @return [Hash{FileAccessor => Hash}] Hash of file accessors by header mappings.

data/lib/cocoapods/validator.rb

@@ -555,6 +555,11 @@ module Pod
       app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
       app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
       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|
+        config.build_settings.delete('ASSETCATALOG_COMPILER_APPICON_NAME')
+      end
       app_project.save
       app_project.recreate_user_schemes
     end

data/lib/cocoapods/version_metadata.rb

@@ -1,11 +1,13 @@
 module Pod
   module VersionMetadata
+    CACHE_VERSION = '001'.freeze
+
     def self.gem_version
       Pod::VERSION
     end
 
     def self.project_cache_version
-      VersionMetadata.gem_version
+      "#{VersionMetadata.gem_version}.project-cache.#{CACHE_VERSION}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.7.0.beta.3
+  version: 1.7.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-05-02 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.7.0.beta.3
+        version: 1.7.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.beta.3
+        version: 1.7.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement