cocoapods-packager-ext 0.0.26 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23cd72018e39de209dccf062d026da054ae4019c38b0fb57ca0a7437efd4b565
-  data.tar.gz: ed3fc72518c0d7163c9ed6a19d760c28d76968890bd7047611807f9852e41ade
+  metadata.gz: beb3e7e72eda56ea2602d0eb868c7bc1cff2ed8e3b21d60b13589e71ab99dc23
+  data.tar.gz: 3d0cd3ffc7d579884e3e01a1908d165d95ba652ab8eacee2a70f83aeec112a84
 SHA512:
-  metadata.gz: b9a31f722da895eb96d120a86f408b5e2ae97e4a48da9fdc41ed1e88335e1a655e5156d8fc2721e5f3d6a4cc3c3784c7dd9d488e44c248e1d19f8f5259629e37
-  data.tar.gz: b8f915b856efeed8eeff81368bfe086323083469f05f6d73bbf85f9a225b5a9932d57c406ed32647a3151cb6f3374c4751a4071b5bc9215c00baa0ba882ba81a
+  metadata.gz: a52643a4e10f5aac404ddb5da76153a5b5492555ec2a25557158bf0bb02f56dc204c72a8e56ed04976857acaf97054ccb5a451489d30a2ec308f9530a7e75417
+  data.tar.gz: c3c417ffa2b5ac7095dde2cc26d345e1f6f15faa455f321e3f0f28641f60ca2c1b6cdabc44934a0e512533541a8e481dd18e747096e42883ffc2a679eda6ad26

data/cocoapods-packager-ext.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_runtime_dependency(%q<cocoapods-packager>.freeze,["1.5.1.alpha.0"])
+  spec.add_runtime_dependency(%q<cocoapods-packager>.freeze,["1.5.1"])
   
 end

data/lib/cocoapods-packager-ext/command/package_ext.rb

@@ -78,7 +78,7 @@ module Pod
   s.#{platform.name.to_s}.deployment_target    = '#{platform.deployment_target}'
   s.#{platform.name.to_s}.vendored_libraries  = ['#{platform.name.to_s}/*.a']
   s.#{platform.name.to_s}.public_header_files = ['#{platform.name.to_s}/Headers/*.{h}']
-  s.#{platform.name.to_s}.source_files = ['#{platform.name.to_s}/Headers/*.{h}']
+  s.#{platform.name.to_s}.source_files = ['#{platform.name.to_s}/Headers/*.{h}',"#{platform.name.to_s}/Modules/module.modulemap"]
   s.#{platform.name.to_s}.resource = ['#{platform.name.to_s}/Resources/*.bundle']
   s.#{platform.name.to_s}.module_map   = "#{platform.name.to_s}/Modules/module.modulemap"
 RB

data/lib/cocoapods-packager-ext/ext/builder.rb

@@ -5,7 +5,23 @@ module Pod
 
     alias build_static_library_t build_static_library
     def build_static_library
-      build_static_library_t
+
+      UI.puts("Building static library #{@spec} with configuration #{@config}")
+
+      defines = compile
+      build_sim_libraries(defines)
+
+      platform_path = Pathname.new(@platform.name.to_s)
+      platform_path.mkdir unless platform_path.exist?
+
+      output = platform_path + "lib#{@spec.name}-#{@platform.name.to_s}.a"
+
+      if @platform.name == :ios
+        build_static_library_for_ios(output)
+      else
+        build_static_library_for_mac(output)
+      end
+
       platform_path = Pathname.new(@platform.name.to_s)
       header_path = platform_path+'Headers'
       header_path.mkpath unless header_path.exist?
@@ -167,7 +183,7 @@ MAP
 
     alias copy_resources_t copy_resources
     def copy_resources
-      copy_resources_to_target @fwk.resources_path
+      copy_resources_to_target @fwk.resources_path unless @dynamic
     end
     def copy_resources_to_target(resources_target_path = nil )
       resources_target_path = @fwk.resources_path if resources_target_path.nil?
@@ -212,9 +228,37 @@ MAP
         end
     end
 
+    alias xcodebuild_t xcodebuild
+
+    def xcodebuild(defines = '', args = '', build_dir = 'build', target = 'Pods-packager', project_root = @static_sandbox_root, config = @config)
+      if defined?(Pod::DONT_CODESIGN)
+        args = "#{args} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
+      end
+
+      command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{config} -target #{target} -project #{project_root}/Pods.xcodeproj 2>&1"
+      output = `#{command}`.lines.to_a
+
+      if $?.exitstatus != 0
+        if ENV['ENABLE_BACKUP_WORKSPACE'] && (ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'YES' || ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'TRUE')
+          target_dir = "#{@source_dir}/#{@spec.name}-#{@spec.version}"
+          work_dir = Dir.pwd
+          `mv "#{work_dir}" "#{target_dir}"`
+        end
+        puts UI::BuildFailedReport.report(command, output)
+
+        # Note: We use `Process.exit` here because it fires a `SystemExit`
+        # exception, which gives the caller a chance to clean up before the
+        # process terminates.
+        #
+        # See http://ruby-doc.org/core-1.9.3/Process.html#method-c-exit
+        Process.exit
+      end
+    end
+
     alias initialize_t initialize
     def initialize(platform, static_installer, source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps,exclude_dep_items=[],select_archs=[])
-      @exclude_dep_items = exclude_dep_items
+      @exclude_dep_items = ['libPods-packager.a']
+      @exclude_dep_items.concat(exclude_dep_items) if exclude_dep_items
       @select_archs = select_archs
       initialize_t(platform, static_installer,source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps)
     end 

data/lib/cocoapods-packager-ext/ext/validator.rb

@@ -0,0 +1,25 @@
+require 'pathname'
+module Pod
+  class Validator
+
+    alias _xcodebuild_t _xcodebuild
+    def _xcodebuild(command, raise_on_failure = false)
+      begin
+        _xcodebuild_t(command, raise_on_failure)
+      rescue => e
+        if ENV['PUSH_BACKUP_PATH']
+          for item in command
+            if item.include?(".xcworkspace")
+              # puts command.join(' ')
+              path = Pathname.new(item).parent
+              puts path
+              `mv #{path} #{ENV['PUSH_BACKUP_PATH']}`
+            end
+          end
+        end
+        raise e
+      end
+    end
+     
+  end
+end

data/lib/cocoapods-packager-ext/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPackagerExt
-  VERSION = "0.0.26"
+  VERSION = "0.0.31"
 end

data/lib/cocoapods_plugin.rb

@@ -1,2 +1,3 @@
 require 'cocoapods-packager-ext/command'
 require 'cocoapods-packager-ext/ext/builder.rb'
+require 'cocoapods-packager-ext/ext/validator.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.31
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1.alpha.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1.alpha.0
+        version: 1.5.1
 description: A short description of cocoapods-packager-ext.
 email:
 - kyle.zhou@qq.com
@@ -73,6 +73,7 @@ files:
 - lib/cocoapods-packager-ext/ext/downloader/lnpath.rb
 - lib/cocoapods-packager-ext/ext/downloader_ext.rb
 - lib/cocoapods-packager-ext/ext/pod_utils.rb
+- lib/cocoapods-packager-ext/ext/validator.rb
 - lib/cocoapods-packager-ext/gem_version.rb
 - lib/cocoapods_plugin.rb
 - spec/command/ext_spec.rb