cocoapods-packager-ext 0.0.24 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aae27a3f5c25819129ae62c04ca6a2310d0af5a0ae4f325779917c6d4e9a6c2
-  data.tar.gz: a2b461879db333181773b33b80398702f4651f66fc395a930664a4b50ad66198
+  metadata.gz: c9812e5e9a1d1b816716bbdea4c7143cd00a5bb409ced69e87057091795f661c
+  data.tar.gz: 49840f81b8ee853a34f1427b2e632b88d397e043ed11e872fcc24de6c5c37073
 SHA512:
-  metadata.gz: fb92fea150a95bbd008db873e24a3a37483c84844b54b9a13970c46728ffd62770f0c5ec8f8a022c2891fec8a73474b38720ea10b69273927d49801f5a0876de
-  data.tar.gz: b7773aee566078b96d2f7515e5452ffe58da0980a55465bcc2b6d139a80b8c8003172752af1d94840ee73f2f151a2b8751a478522dc8ac4fb176c65f17d35620
+  metadata.gz: a9de7513e68ce21c894a88f9d4404ec2ee2089e844354ecee9adf3817fdc0d39b72b9c8f8d5e25c80374795f2c713213d980376be458b2f20b81eda975554e27
+  data.tar.gz: d4da5a7071c4145eeb38b9b4dfbbef0e98239954c06761fa22ef1a4851c6f316ee4e9092ebff814b1c296b2ba152ce3812e45014d45fb8a02386ffd2be2bffc9

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

@@ -65,7 +65,8 @@ module Pod
             begin
                 perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
             ensure # in case the build fails; see Builder#xcodebuild.
-                if not ENV['ENABLE_BACKUP_WORKSPACE']
+                if ENV['ENABLE_BACKUP_WORKSPACE'] && (ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'YES' || ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'TRUE')
+                else
                     Pathname.new(config.sandbox_root).rmtree
                     FileUtils.rm_f('Podfile.lock')
                 end
@@ -108,7 +109,6 @@ RB
                             newspec += spec_library(platform)
                         else
                             newspec += builder.spec_platform(platform)
-                            newspec += spec_framework(platform)
                         end
 
 

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

@@ -61,7 +61,7 @@ module Pod
     end
 
     def ios_build_options
-      if ENV['DISABLE_BITCODE']
+      if ENV['DISABLE_BITCODE'] && (ENV['DISABLE_BITCODE'].upcase == 'YES' || ENV['DISABLE_BITCODE'].upcase == 'TRUE')
         "ARCHS=\'#{ios_architectures.join(' ')}\' OTHER_CFLAGS=\'-Qunused-arguments\'"
       else
         "ARCHS=\'#{ios_architectures.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
@@ -167,7 +167,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?
@@ -196,6 +196,9 @@ MAP
         if resources.count > 0
           `cp -rp #{resources.join(' ')} #{resources_target_path}`
         end
+        if bundles.count > 0
+          `cp -rp #{bundles.join(' ')} #{resources_target_path}`
+        end
       end
     end
 
@@ -209,6 +212,33 @@ 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

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

@@ -45,7 +45,7 @@ module Pod
             config.build_settings['USER_HEADER_SEARCH_PATHS'] = "$(inherited) #{header_path}"
             config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -ObjC'
 
-            if ENV['DISABLE_BITCODE']
+            if ENV['DISABLE_BITCODE'] && (ENV['DISABLE_BITCODE'].upcase == 'YES' || ENV['DISABLE_BITCODE'].upcase == 'TRUE')
               config.build_settings['ENABLE_BITCODE'] = 'NO'
             end
           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.24"
+  VERSION = "0.0.29"
 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.24
+  version: 0.0.29
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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