cocoapods-packager-ext 0.0.23 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84c499b900fb1168ebcbf8f5b71cacc402e4a29e6204357b99655df721d1d4dd
-  data.tar.gz: c2832c442bfc7d0650563b4b512457ba6fb018a5604b9ca9a9cb4f0bf2b8bba3
+  metadata.gz: a4a7c4eb8ea2da2a0ba4062e761774f735b9f876d844a5d496572ca8f8f8ba06
+  data.tar.gz: 0bd6ff054c0a6a9693a6874f6d49c2756648b49b3a677e1bd0a20b004ee014d9
 SHA512:
-  metadata.gz: 9ba741c09f68fb3a4712f2375ec87ea6fea71f87bbb343e8f416cbc7b38c09a558e20cb336280d117d4c7cec944bb860654edcd0d55638562c7a6c9a766590b5
-  data.tar.gz: 83b0a5513f8f18973fd663c7dc25b5a243055a89b16070a4fc8558683a95851a59cea473ffb0f41e84327779ebf4d0c8acf6d72ff9989bdcfdbf9f99a7692154
+  metadata.gz: d2bea48cee61556923f7f931eda06e82b39424adda0f3b144e4f75eceb3c98dab15aa029ecba464b0c4dc1ed686482f597e57b333c118f468f0e7de1863a381a
+  data.tar.gz: 1a1d97ad12dee4bbf539c417896b0ebe85867302130a3fa6fc97c8e678597340bb58d2f5d6debdd897ad4150907fb1cc422dbadfbf30b4b797011434b9621db8

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
@@ -74,12 +75,21 @@ module Pod
 
         def spec_library(platform)
             spec = <<RB
-  s.#{platform.name}.deployment_target    = '#{platform.deployment_target}'
-  s.#{platform.name}.vendored_libraries  = ['#{platform}/*.a']
-  s.#{platform.name}.public_header_files = ['#{platform}/Headers/*.{h}']
-  s.#{platform.name}.source_files = ['#{platform}/Headers/*.{h}']
-  s.#{platform.name}.resource = ['#{platform}/Resources/*.bundle']
-  s.#{platform.name}.module_map   = "#{platform}/Modules/module.modulemap"
+  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}.resource = ['#{platform.name.to_s}/Resources/*.bundle']
+  s.#{platform.name.to_s}.module_map   = "#{platform.name.to_s}/Modules/module.modulemap"
+RB
+        end
+
+        def spec_framework(platform)
+            spec = <<RB
+  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}.resource = ['#{platform.name.to_s}/**/Resources/*.bundle']
+  s.#{platform.name.to_s}.module_map   = "#{platform.name.to_s}/**/Modules/module.modulemap"
 RB
         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\'"
@@ -113,7 +113,7 @@ module Pod
       copy_headers_to_target @fwk.headers_path
     end
 
-    def copy_headers_to_target(headers_target_path,module_map_target_path)
+    def copy_headers_to_target(headers_target_path = nil ,module_map_target_path = nil )
       headers_target_path = @fwk.headers_path if headers_target_path.nil?
       module_map_target_path = @fwk.module_map_path if module_map_target_path.nil?
 
@@ -167,9 +167,9 @@ 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)
+    def copy_resources_to_target(resources_target_path = nil )
       resources_target_path = @fwk.resources_path if resources_target_path.nil?
       if @exclude_deps
         bundles = @static_installer.pod_targets.flat_map(&:file_accessors).flat_map{|item|item.resources}
@@ -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
 

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.23"
+  VERSION = "0.0.28"
 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.23
+  version: 0.0.28
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-05-26 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