cocoapods-amimono 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db2a3eed2c383d3eb046ee3c47af9bf80564719
-  data.tar.gz: 7967b1b3bb40082178b294635b959e6608e7cfa1
+  metadata.gz: 84947eb0089e7f1d0f9bda450455abebb42e9a33
+  data.tar.gz: b763b27ea7c1a8ee647044a6bf5661580cbe981d
 SHA512:
-  metadata.gz: 87eb480d8fa3cd6200ecdbb83a2a9d78fb4bbbfa97071a9cfc3e462399a72ecc0d8b9fbbf6b9ac675eaf04275f04568b34870403486808fafeccbb70b4239c13
-  data.tar.gz: 6cc6d07c691b65572bec33fb825aec17855615322727dfd6641ef1db04fc2d324a682e88debd13158f94f82d64b71a29b568b3faea0b0e64e3f0b987ccaa0d79
+  metadata.gz: bed92bffa635f6ec1056a5d7eaf6f30fe6b8e8614e09fd97bb7e1504c42578d72c4b4fd43df2fea9bc47a808f1619db86d4313899d4a0a61b6f9691456fbb636
+  data.tar.gz: 691d1be66daee9184c9c9c63d6d3d18a2b816c36160e812d3cf6ade5bf43ac324457d6eeabbd90a3364791943c87a4630eb4239d823dc207ad417088630460e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-amimono (0.0.7)
+    cocoapods-amimono (0.0.8)
 
 GEM
   remote: https://rubygems.org/
@@ -93,4 +93,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.14.1
+   1.14.6

data/README.md

@@ -1,7 +1,7 @@
 # cocoapods-amimono
 
 <p align="center">
-  <img src="https://dl.dropboxusercontent.com/u/12352209/GitHub/amimono.gif" alt="amimono"/>
+  <img src="https://raw.githubusercontent.com/Ruenzuo/res/master/amimono.gif" alt="amimono"/>
 </p>
 
 Move all dynamic frameworks symbols into the main executable.
@@ -21,7 +21,7 @@ This is hardly an option for some. If you think you might be in that group, then
 
 This plugin is based on [dyld-image-loading-performance](https://github.com/stepanhruda/dyld-image-loading-performance). In a nutshell, it copies all symbols of your CocoaPods dependencies into your main app executable, so the dynamic linker doesn't have to load the frameworks. You can verify this yourself by enabling
 
-![log_setting_xcode.png](https://dl.dropboxusercontent.com/u/12352209/GitHub/log_setting_xcode.png)
+![log_setting_xcode.png](https://raw.githubusercontent.com/Ruenzuo/res/master/log_setting_xcode.png)
 
 and looking at the log output you shouldn't find any `dlopen` call of your CocoaPods frameworks.
 

data/lib/cocoapods-amimono/{integrator.rb → build_phases_updater.rb}

@@ -1,11 +1,5 @@
 module Amimono
-  class Integrator
-
-    attr_reader :installer_context
-
-    def initialize(installer_context)
-      @installer_context = installer_context
-    end
+  class BuildPhasesUpdater
 
     FILELIST_SCRIPT = <<-SCRIPT.strip_heredoc
           IFS=" " read -r -a SPLIT <<< "$ARCHS"
@@ -29,25 +23,7 @@ module Amimono
 
     AMIMONO_FILELIST_BUILD_PHASE = '[Amimono] Create filelist per architecture'
 
-    def update_xcconfigs(aggregated_target_sandbox_path)
-      path = aggregated_target_sandbox_path
-      archs = ['armv7', 'armv7s', 'arm64', 'i386', 'x86_64']
-      # Find all xcconfigs for the aggregated target
-      Dir.entries(path).select { |entry| entry.end_with? 'xcconfig' }.each do |entry|
-        full_path = path + entry
-        xcconfig = Xcodeproj::Config.new full_path
-        # Clear the -frameworks flag
-        xcconfig.other_linker_flags[:frameworks] = Set.new
-        # 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)-$(TARGET_NAME)-#{arch}.objects.filelist\""
-        end
-        xcconfig.save_as full_path
-      end
-    end
-
-    def update_build_phases(aggregated_targets)
+    def update_build_phases(installer_context, aggregated_targets)
       # All user projects should be the same I hope
       user_project = aggregated_targets.first.user_project
       aggregated_targets.each do |aggregated_target|
@@ -56,7 +32,7 @@ module Amimono
         # Remove the `Embed Pods Frameworks` build phase
         remove_embed_pods_frameworks(user_target)
         # Create or update [Amimono] build phase
-        create_or_update_amimono_phase(user_target, AMIMONO_FILELIST_BUILD_PHASE, generate_filelist_script(aggregated_target))
+        create_or_update_amimono_phase(user_target, AMIMONO_FILELIST_BUILD_PHASE, generate_filelist_script(installer_context, aggregated_target))
         puts "[Amimono] Build phases updated for target #{aggregated_target.cocoapods_target_label}"
       end
       user_project.save
@@ -78,7 +54,7 @@ module Amimono
       user_target.build_phases.uniq!
     end
 
-    def generate_filelist_script(aggregated_target)
+    def generate_filelist_script(installer_context, aggregated_target)
       dependencies = []
       installer_context.pods_project.targets.select { |target| target.name == aggregated_target.cocoapods_target_label }.first.dependencies.each do |dependency|
         case dependency.target.product_type

data/lib/cocoapods-amimono/gem_version.rb

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

data/lib/cocoapods-amimono/patcher.rb

@@ -1,4 +1,5 @@
 require 'cocoapods/installer'
+require 'cocoapods-amimono/xcconfig_updater'
 
 module Amimono
   # This class will patch your project's copy resources script to match the one that would be
@@ -6,12 +7,24 @@ module Amimono
   class Patcher
 
     def self.patch!(installer)
+      patch_xcconfig_files(installer)
       patch_copy_resources_script(installer)
       patch_vendored_build_settings(installer)
     end
 
     private
 
+    def self.patch_xcconfig_files(installer)
+      aggregated_targets = installer.aggregate_targets.reject { |target| target.label.include? 'Test' }
+      updater = XCConfigUpdater.new(installer)
+      aggregated_targets.each do |aggregated_target|
+        puts "[Amimono] Pods target found: #{aggregated_target.label}"
+        target_support = installer.sandbox.target_support_files_dir(aggregated_target.label)
+        updater.update_xcconfigs(aggregated_target, target_support)
+        puts "[Amimono] xcconfigs updated with filelist for target #{aggregated_target.label}"
+      end
+    end
+
     def self.patch_vendored_build_settings(installer)
       aggregated_targets = installer.aggregate_targets.reject { |target| target.label.include? 'Test' }
       aggregated_targets.each do |aggregated_target|

data/lib/cocoapods-amimono/xcconfig_updater.rb

@@ -0,0 +1,28 @@
+module Amimono
+  class XCConfigUpdater
+    attr_reader :installer
+
+    def initialize(installer)
+      @installer = installer
+    end
+
+    def update_xcconfigs(aggregated_target, aggregated_target_sandbox_path)
+      path = aggregated_target_sandbox_path
+      archs = ['armv7', 'armv7s', 'arm64', 'i386', 'x86_64']
+      # Find all xcconfigs for the aggregated target
+      Dir.entries(path).select { |entry| entry.end_with? 'xcconfig' }.each do |entry|
+        full_path = path + entry
+        xcconfig = Xcodeproj::Config.new full_path
+        # Clear the -frameworks flag
+        xcconfig.other_linker_flags[:frameworks] = Set.new(aggregated_target.pod_targets.reject(&:should_build?).map(&:name))
+        # 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)-$(TARGET_NAME)-#{arch}.objects.filelist\""
+        end
+        xcconfig.save_as full_path
+      end
+    end
+
+  end
+end

data/lib/cocoapods_plugin.rb

@@ -1,20 +1,10 @@
 require 'cocoapods-amimono/command'
-require 'cocoapods-amimono/integrator'
+require 'cocoapods-amimono/build_phases_updater'
 
 Pod::HooksManager.register('cocoapods-amimono', :post_install) do |installer_context|
   # We exclude all targets that contain `Test`, which might not work for some test targets
   # that doesn't include that word
   pods_targets = installer_context.umbrella_targets.reject { |target| target.cocoapods_target_label.include? 'Test' }
-  target_info = Hash.new
-  pods_targets.each do |pods_target|
-    puts "[Amimono] Pods target found: #{pods_target.cocoapods_target_label}"
-    target_info[pods_target] = installer_context.sandbox.target_support_files_dir pods_target.cocoapods_target_label
-  end
-
-  integrator = Amimono::Integrator.new(installer_context)
-  target_info.each do |pods_target, path|
-    integrator.update_xcconfigs(path)
-    puts "[Amimono] xcconfigs updated with filelist for target #{pods_target.cocoapods_target_label}"
-  end
-  integrator.update_build_phases(target_info.keys)
+  updater = Amimono::BuildPhasesUpdater.new
+  updater.update_build_phases(installer_context, pods_targets)
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-amimono
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Renzo Crisostomo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-04-07 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
@@ -55,11 +55,12 @@ files:
 - bin/amimono
 - cocoapods-amimono.gemspec
 - lib/cocoapods-amimono.rb
+- lib/cocoapods-amimono/build_phases_updater.rb
 - lib/cocoapods-amimono/command.rb
 - lib/cocoapods-amimono/command/amimono.rb
 - lib/cocoapods-amimono/gem_version.rb
-- lib/cocoapods-amimono/integrator.rb
 - lib/cocoapods-amimono/patcher.rb
+- lib/cocoapods-amimono/xcconfig_updater.rb
 - lib/cocoapods_plugin.rb
 - spec/command/amimono_spec.rb
 - spec/spec_helper.rb
@@ -73,17 +74,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.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 3
 summary: Move all dynamic frameworks symbols into the main executable.