cocoapods-amimono 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e30439c931168e37c701a6b32a76fee58a6fdf5
-  data.tar.gz: 982a2fec2cf47816cc0ef881f490e8ad078b9796
+  metadata.gz: 8db2a3eed2c383d3eb046ee3c47af9bf80564719
+  data.tar.gz: 7967b1b3bb40082178b294635b959e6608e7cfa1
 SHA512:
-  metadata.gz: 025476375dee99fd73ba30c09c46c5cc2f99d51d47964171bb1b3007e6eca0dc8272c35f92834815c376388d9f699db4476141080630425881b699a495647573
-  data.tar.gz: 200c539fc225795a5e84c5a2e6cdf36cb519bf4b3e7d6457dfde990c059c078b13f51cbc2d295094da6907ebe00fceea4f3d35ff7d72898490be1897d76f2cc6
+  metadata.gz: 87eb480d8fa3cd6200ecdbb83a2a9d78fb4bbbfa97071a9cfc3e462399a72ecc0d8b9fbbf6b9ac675eaf04275f04568b34870403486808fafeccbb70b4239c13
+  data.tar.gz: 6cc6d07c691b65572bec33fb825aec17855615322727dfd6641ef1db04fc2d324a682e88debd13158f94f82d64b71a29b568b3faea0b0e64e3f0b987ccaa0d79

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'cocoapods'
+  gem 'cocoapods', '>= 1.2.0'
 
   gem 'mocha'
   gem 'bacon'

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    cocoapods-amimono (0.0.5)
+    cocoapods-amimono (0.0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.4)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -13,63 +14,70 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     bacon (1.2.0)
-    claide (1.0.0)
-    cocoapods (1.0.1)
-      activesupport (>= 4.0.2)
-      claide (>= 1.0.0, < 2.0)
-      cocoapods-core (= 1.0.1)
-      cocoapods-deintegrate (>= 1.0.0, < 2.0)
-      cocoapods-downloader (>= 1.0.0, < 2.0)
+    claide (1.0.1)
+    cocoapods (1.2.0)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.2.0)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.0.0, < 2.0)
-      cocoapods-try (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.1.2, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.5)
+      fourflusher (~> 2.0.1)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.5)
       nap (~> 1.0)
-      xcodeproj (>= 1.1.0, < 2.0)
-    cocoapods-core (1.0.1)
-      activesupport (>= 4.0.2)
+      ruby-macho (~> 0.2.5)
+      xcodeproj (>= 1.4.1, < 2.0)
+    cocoapods-core (1.2.0)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.0)
-    cocoapods-downloader (1.1.0)
+    cocoapods-deintegrate (1.0.1)
+    cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.0.0)
+    cocoapods-trunk (1.1.2)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     colored (1.2)
     escape (0.0.4)
-    fourflusher (0.3.2)
+    fourflusher (2.0.1)
     fuzzy_match (2.0.4)
+    gh_inspector (1.0.2)
     i18n (0.7.0)
     json (1.8.3)
     metaclass (0.0.4)
-    minitest (5.9.1)
+    minitest (5.10.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.4.5)
+    molinillo (0.5.5)
+    nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
     prettybacon (0.0.2)
       bacon (~> 1.2)
     rake (11.2.2)
+    ruby-macho (0.2.6)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (1.2.0)
+    xcodeproj (1.4.1)
+      CFPropertyList (~> 2.3.3)
       activesupport (>= 3)
-      claide (>= 1.0.0, < 2.0)
+      claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
+      nanaimo (~> 0.2.0)
 
 PLATFORMS
   ruby
@@ -77,7 +85,7 @@ PLATFORMS
 DEPENDENCIES
   bacon
   bundler (~> 1.3)
-  cocoapods
+  cocoapods (>= 1.2.0)
   cocoapods-amimono!
   mocha
   mocha-on-bacon
@@ -85,4 +93,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.12.5
+   1.14.1

data/README.md

@@ -51,7 +51,7 @@ Add the following to your `post_install` hook:
 ```ruby
 post_install do |installer|
   require 'cocoapods-amimono/patcher'
-  Amimono::Patcher.patch!(installer: installer)
+  Amimono::Patcher.patch!(installer)
   ...
 ```
 

data/lib/cocoapods-amimono/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAmimono
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/cocoapods-amimono/integrator.rb

@@ -23,7 +23,7 @@ module Amimono
               fi
             done
             filelist=${filelist\%$'\\n'}
-            echo "$filelist" > "${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}-${ARCH}.objects.filelist"
+            echo "$filelist" > "${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}-${TARGET_NAME}-${ARCH}.objects.filelist"
           done
         SCRIPT
 
@@ -41,7 +41,7 @@ module Amimono
         # Add -filelist flag instead, for each architecture
         archs.each do |arch|
           config_key = "OTHER_LDFLAGS[arch=#{arch}]"
-          xcconfig.attributes[config_key] = "$(inherited) -filelist \"$(OBJROOT)/Pods.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)-#{arch}.objects.filelist\""
+          xcconfig.attributes[config_key] = "$(inherited) -filelist \"$(OBJROOT)/Pods.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)-$(TARGET_NAME)-#{arch}.objects.filelist\""
         end
         xcconfig.save_as full_path
       end

data/lib/cocoapods-amimono/patcher.rb

@@ -23,7 +23,7 @@ module Amimono
           # But this also works and it's simpler
           configuration = entry.split('.')[-2]
           pod_targets = aggregated_target.pod_targets_for_build_configuration configuration
-          generate_vendored_build_settings(pod_targets, xcconfig)
+          generate_vendored_build_settings(aggregated_target, pod_targets, xcconfig)
           xcconfig.save_as full_path
         end
         puts "[Amimono] Vendored build settings patched for target #{aggregated_target.label}"
@@ -42,12 +42,14 @@ module Amimono
       end
     end
 
-    # Copied over from https://github.com/CocoaPods/CocoaPods/blob/e5afc825eeafa60933a1299f52eb764c267cc9b2/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb#L152-L158
+    # Copied over from https://github.com/CocoaPods/CocoaPods/blob/2fa648221b6548e941116f5e146361ba557bbed0/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb#L183-L191
     # with some modifications to this particular use case
-    def self.generate_vendored_build_settings(pod_targets, xcconfig)
-      pod_targets.each do |pod_target|
-        Pod::Generator::XCConfig::XCConfigHelper.add_settings_for_file_accessors_of_target(pod_target, xcconfig)
-      end
+    def self.generate_vendored_build_settings(aggregated_target, pod_targets, xcconfig)
+        targets = pod_targets + aggregated_target.search_paths_aggregate_targets.flat_map(&:pod_targets)
+
+        targets.each do |pod_target|
+            Pod::Generator::XCConfig::XCConfigHelper.add_settings_for_file_accessors_of_target(aggregated_target, pod_target, xcconfig)
+        end
     end
 
     # Copied over from https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb#L115-L131

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-amimono
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Renzo Crisostomo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Move all dynamic frameworks symbols into the main executable.
@@ -46,7 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -73,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 3
 summary: Move all dynamic frameworks symbols into the main executable.