cocoapods 0.38.1 → 0.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2478b064fb73530c9c036e28c2c6606b42b7d3b
-  data.tar.gz: 4fac9de32fe421f5da6263aa83e0b3aa0e9c0198
+  metadata.gz: d7e6d94a848bdb964b5ba5ce93ed5b4622582585
+  data.tar.gz: 4df9560e7a5e4d148e5faf78e901c9566f0b9853
 SHA512:
-  metadata.gz: e0eef7db2285e17e364e71446df6c02636f15b58ff8dca4a8a6cf3d52fb0b7b024cac1e6bb5415102d603c1531b9aae61712f54d200eea385816acb1a595d0f0
-  data.tar.gz: 11e7765076e7af986feea1ce1b216c2342a57bca34292eb7844fcb2cf9ad9849fe16b74758c6c63549604da4c541a327cb5d49591ae50f6bfcc5429ad34a714e
+  metadata.gz: 809cbe13a9be6eb1599647b37609a385bad36bd0eabc87cbff8e1feac6e6f26722a22886e2d7de562a7c3e04b080b35ef0429b6358683f4c7441103f80f9045f
+  data.tar.gz: 9a54449a7162af315e8196762220f6fbdc2ba5ea1941d3bd0b557fd6ccc1cf2900f74024457ede1cf894bbf39a1e7b16d1cbbf03bbaed1c255ebc9192f721704

data/CHANGELOG.md

@@ -4,6 +4,36 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.38.2
+
+##### Bug Fixes
+
+* Fix generation of xcconfig files that specify both `-iquote` and `-isystem`
+  headers.  
+  [Russ Bishop](https://github.com/russbishop)
+  [#3893](https://github.com/CocoaPods/CocoaPods/issues/3893)
+
+* Pods integrated as static libraries can no longer be imported as
+  modules, as that change had unexpected side-effects.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3898](https://github.com/CocoaPods/CocoaPods/pull/3898)
+  [#3879](https://github.com/CocoaPods/CocoaPods/issues/3879)
+  [#3888](https://github.com/CocoaPods/CocoaPods/issues/3888)
+  [#3886](https://github.com/CocoaPods/CocoaPods/issues/3886)
+  [#3889](https://github.com/CocoaPods/CocoaPods/issues/3889)
+  [#3884](https://github.com/CocoaPods/CocoaPods/issues/3884)
+
+* Source file locking now happens after plugin and podfile post-install hooks
+  have run.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3529](https://github.com/CocoaPods/CocoaPods/issues/3529)
+
+* Only set project, dylib, and compatibility versions to valid, three integer
+  values.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3887](https://github.com/CocoaPods/CocoaPods/issues/3887)
+
+
 ## 0.38.1
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.38.1' unless defined? Pod::VERSION
+  VERSION = '0.38.2' unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/module_map.rb

@@ -42,9 +42,8 @@ module Pod
       # @return [String]
       #
       def generate
-        module_declaration_qualifier = target.requires_frameworks? ? 'framework ' : ''
         result = <<-eos.strip_heredoc
-          #{module_declaration_qualifier}module #{target.product_module_name} {
+          framework module #{target.product_module_name} {
             umbrella header "#{target.umbrella_header_path.basename}"
 
             export *

data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -109,7 +109,7 @@ module Pod
               # Make library headers discoverale by `#import "…"`
               library_header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
               build_settings['HEADER_SEARCH_PATHS'] = XCConfigHelper.quote(library_header_search_paths)
-              build_settings['OTHER_CFLAGS'] += XCConfigHelper.quote(library_header_search_paths, '-isystem')
+              build_settings['OTHER_CFLAGS'] += ' ' + XCConfigHelper.quote(library_header_search_paths, '-isystem')
             end
             if pod_targets.any? { |t| t.should_build? && t.scoped? }
               build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'

data/lib/cocoapods/installer.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/string/inflections'
+require 'fileutils'
 
 module Pod
   # The Installer is responsible of taking a Podfile and transform it in the
@@ -113,6 +114,7 @@ module Pod
 
     def prepare
       UI.message 'Preparing' do
+        FileUtils.chmod_R('+w', sandbox.root)
         sandbox.prepare
         ensure_plugins_are_installed!
         Migrator.migrate(sandbox)
@@ -141,7 +143,6 @@ module Pod
         install_pod_sources
         run_podfile_pre_install_hooks
         clean_pod_sources
-        lock_pod_sources
       end
     end
 
@@ -442,6 +443,7 @@ module Pod
     def perform_post_install_actions
       run_plugins_post_install_hooks
       warn_for_deprecations
+      lock_pod_sources
     end
 
     # Runs the registered callbacks for the plugins post install hooks.

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -78,8 +78,7 @@ module Pod
         file_accessors.each do |file_accessor|
           file_accessor.source_files.each do |source_file|
             next unless source_file.exist?
-            new_permissions = source_file.stat.mode & ~0222
-            source_file.chmod(new_permissions)
+            FileUtils.chmod('-w', source_file)
           end
         end
       end

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -22,15 +22,13 @@ module Pod
           create_xcconfig_file
           if target.requires_frameworks?
             create_info_plist_file
+            create_module_map do |generator|
+              generator.private_headers += target.file_accessors.flat_map(&:private_headers).map(&:basename)
+            end
+            create_umbrella_header do |generator|
+              generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
+            end
           end
-          create_module_map do |generator|
-            generator.private_headers += target.file_accessors.flat_map(&:private_headers).map(&:basename)
-          end
-          create_umbrella_header do |generator|
-            generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
-          end
-          link_module_map
-          link_umbrella_header
           create_prefix_header
           create_dummy_source
         end
@@ -47,9 +45,10 @@ module Pod
         settings = super
         if target.requires_frameworks?
           version = target.root_spec.version
-          compatibility_version = version.segments.first
-          compatibility_version = version.version if compatibility_version < 1
-          settings['CURRENT_PROJECT_VERSION'] = version.version
+          project_version = [version.major, version.minor, version.patch].join('.')
+          compatibility_version = version.major
+          compatibility_version = project_version if compatibility_version < 1
+          settings['CURRENT_PROJECT_VERSION'] = project_version
           settings['DYLIB_COMPATIBILITY_VERSION'] = compatibility_version.to_s
           settings['DYLIB_CURRENT_VERSION'] = '$(CURRENT_PROJECT_VERSION)'
         end
@@ -185,27 +184,6 @@ module Pod
         end
       end
 
-      # Links a module map to Public headers.
-      #
-      # @return [void]
-      #
-      def link_module_map
-        return if target.requires_frameworks? && target.should_build?
-
-        sandbox.public_headers.add_file(target.name, target.module_map_path, 'module.modulemap', target.platform)
-      end
-
-      # Links a an umbrella header to Public headers.
-      #
-      # @return [void]
-      #
-      def link_umbrella_header
-        return if custom_module_map
-        return if target.requires_frameworks? && target.should_build?
-
-        sandbox.public_headers.add_files(target.name, [target.umbrella_header_path], target.platform)
-      end
-
       # Creates a prefix header file which imports `UIKit` or `Cocoa` according
       # to the platform of the target. This file also include any prefix header
       # content reported by the specification of the pods.
@@ -303,12 +281,6 @@ module Pod
           FileUtils.cp(custom_module_map, path)
           add_file_to_support_group(path)
 
-          unless target.requires_frameworks?
-            contents = path.read
-            contents.gsub!(/^\s*framework\s+module/, 'module')
-            path.open('w') { |f| f.write(contents) }
-          end
-
           native_target.build_configurations.each do |c|
             relative_path = path.relative_path_from(sandbox.root)
             c.build_settings['MODULEMAP_FILE'] = relative_path.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.38.1
+  version: 0.38.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.38.1
+        version: 0.38.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.38.1
+        version: 0.38.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement