cocoapods 1.11.0 → 1.12.1

data/lib/cocoapods/validator.rb

@@ -58,7 +58,6 @@ module Pod
         end
         result
       end
-      @use_frameworks = true
     end
 
     #-------------------------------------------------------------------------#
@@ -110,7 +109,7 @@ module Pod
     # @note   This method shows immediately which pod is being processed and
     #         overrides the printed line once the result is known.
     #
-    # @return [Bool] whether the specification passed validation.
+    # @return [Boolean] whether the specification passed validation.
     #
     def validate
       @results = []
@@ -201,23 +200,23 @@ module Pod
 
     #  @!group Configuration
 
-    # @return [Bool] whether the validation should skip the checks that
+    # @return [Boolean] whether the validation should skip the checks that
     #         requires the download of the library.
     #
     attr_accessor :quick
 
-    # @return [Bool] whether the linter should not clean up temporary files
+    # @return [Boolean] whether the linter should not clean up temporary files
     #         for inspection.
     #
     attr_accessor :no_clean
 
-    # @return [Bool] whether the linter should fail as soon as the first build
+    # @return [Boolean] whether the linter should fail as soon as the first build
     #         variant causes an error. Helpful for i.e. multi-platforms specs,
     #         specs with subspecs.
     #
     attr_accessor :fail_fast
 
-    # @return [Bool] whether the validation should be performed against the root of
+    # @return [Boolean] whether the validation should be performed against the root of
     #         the podspec instead to its original source.
     #
     # @note   Uses the `:path` option of the Podfile.
@@ -225,7 +224,7 @@ module Pod
     attr_accessor :local
     alias_method :local?, :local
 
-    # @return [Bool] Whether the validator should fail on warnings, or only on errors.
+    # @return [Boolean] Whether the validator should fail on warnings, or only on errors.
     #
     attr_accessor :allow_warnings
 
@@ -233,11 +232,11 @@ module Pod
     #
     attr_accessor :only_subspec
 
-    # @return [Bool] Whether the validator should validate all subspecs.
+    # @return [Boolean] Whether the validator should validate all subspecs.
     #
     attr_accessor :no_subspecs
 
-    # @return [Bool] Whether the validator should skip building and running tests.
+    # @return [Boolean] Whether the validator should skip building and running tests.
     #
     attr_accessor :skip_tests
 
@@ -245,11 +244,11 @@ module Pod
     #
     attr_accessor :test_specs
 
-    # @return [Bool] Whether the validator should run Xcode Static Analysis.
+    # @return [Boolean] Whether the validator should run Xcode Static Analysis.
     #
     attr_accessor :analyze
 
-    # @return [Bool] Whether frameworks should be used for the installation.
+    # @return [Boolean] Whether frameworks should be used for the installation.
     #
     attr_accessor :use_frameworks
 
@@ -324,6 +323,10 @@ module Pod
       @validation_dir ||= Pathname(Dir.mktmpdir(['CocoaPods-Lint-', "-#{spec.name}"]))
     end
 
+    def validation_dir=(validation_dir)
+      @validation_dir = Pathname(validation_dir) unless validation_dir.nil?
+    end
+
     # @return [String] The SWIFT_VERSION that should be used to validate the pod. This is set by passing the
     # `--swift-version` parameter during validation.
     #
@@ -583,12 +586,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
@@ -818,8 +830,8 @@ module Pod
       file_accessor.vendored_libraries.each do |lib|
         basename = File.basename(lib)
         lib_name = basename.downcase
-        unless lib_name.end_with?('.a') && lib_name.start_with?('lib')
-          warning('vendored_libraries', "`#{basename}` does not match the expected static library name format `lib[name].a`")
+        unless lib_name.end_with?('.a', '.dylib') && lib_name.start_with?('lib')
+          warning('vendored_libraries', "`#{basename}` does not match the expected library name format `lib[name].a` or `lib[name].dylib`")
         end
       end
       validate_nonempty_patterns(:vendored_libraries, :warning)
@@ -983,7 +995,7 @@ module Pod
     #         the deployment target, which should be declared in
     #         the Podfile.
     #
-    # @param  [Bool] use_frameworks
+    # @param  [Boolean] use_frameworks
     #         whether frameworks should be used for the installation
     #
     # @param [Array<String>] test_spec_names
@@ -1089,7 +1101,6 @@ module Pod
         end
       when :watchos
         command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
-        command += Fourflusher::SimControl.new.destination(:oldest, 'watchOS', deployment_target)
       when :tvos
         command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
         command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
@@ -1122,7 +1133,7 @@ module Pod
     # @param  [Platform] platform
     #         The platform to check
     #
-    # @return [Bool] True if the platform is valid
+    # @return [Boolean] True if the platform is valid
     #
     def valid_platform?(platform)
       VALID_PLATFORMS.any? { |p| p.name == platform.name }
@@ -1136,7 +1147,7 @@ module Pod
     # @param  [Specification] spec
     #         The specification which must support the provided platform
     #
-    # @return [Bool] Whether the platform is supported by the specification
+    # @return [Boolean] Whether the platform is supported by the specification
     #
     def supported_platform?(platform, spec)
       available_platforms = spec.available_platforms

data/lib/cocoapods/xcode/xcframework/xcframework_slice.rb

@@ -4,7 +4,7 @@ module Pod
   module Xcode
     class XCFramework
       class Slice
-        # @return [Pathname] the path to the .framework or .a of this slice
+        # @return [Pathname] the path to the .framework, .a or .dylib of this slice
         #
         attr_reader :path
 
@@ -45,9 +45,15 @@ module Pod
             when :framework
               File.basename(path, '.framework')
             when :library
-              result = File.basename(path, '.a').gsub(/^lib/, '')
-              result[0] = result.downcase[0]
-              result
+              ext = File.extname(path)
+              case ext
+              when '.a', '.dylib'
+                result = File.basename(path).gsub(/^lib/, '')
+                result[0] = result.downcase[0]
+                result
+              else
+                raise Informative, "Invalid package type `#{package_type}`"
+              end
             else
               raise Informative, "Invalid package type `#{package_type}`"
             end
@@ -68,7 +74,7 @@ module Pod
             case ext
             when '.framework'
               :framework
-            when '.a'
+            when '.a', '.dylib'
               :library
             else
               raise Informative, "Invalid XCFramework slice type `#{ext}`"
@@ -109,7 +115,7 @@ module Pod
             packaging = case ext
                         when '.framework'
                           :framework
-                        when '.a'
+                        when '.a', '.dylib'
                           :library
                         else
                           raise Informative, "Invalid XCFramework slice type `#{ext}`"

data/lib/cocoapods/xcode/xcframework.rb

@@ -91,7 +91,7 @@ module Pod
           slice_path = slice_root.join(relative_path)
           headers = slice_root.join(headers) unless headers.nil?
           XCFramework::Slice.new(slice_path, identifier, archs, platform_name, :platform_variant => platform_variant, :headers => headers)
-        end
+        end.sort_by(&:identifier)
         raise Informative, "XCFramework at #{path} does not contain any frameworks or libraries." if slices.empty?
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2023-04-18 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
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -133,7 +133,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -143,7 +143,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -283,7 +283,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -293,7 +293,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -345,14 +345,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 description: |-
   CocoaPods manages library dependencies for your Xcode project.
 
@@ -458,6 +458,7 @@ files:
 - lib/cocoapods/installer/analyzer/target_inspector.rb
 - lib/cocoapods/installer/base_install_hooks_context.rb
 - lib/cocoapods/installer/installation_options.rb
+- lib/cocoapods/installer/pod_source_downloader.rb
 - lib/cocoapods/installer/pod_source_installer.rb
 - lib/cocoapods/installer/pod_source_preparer.rb
 - lib/cocoapods/installer/podfile_validator.rb
@@ -545,7 +546,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: The Cocoa library package manager.