cocoapods-swordfish 0.1.7 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721947b07fdb080d739ebf37d1ed4f99db011ac6ef356f412b1dd4a58b971c47
-  data.tar.gz: 067416a8676c02a51ab0ac40f0a2e81843f113e9337f878994b260c9658815d8
+  metadata.gz: 34fe76b2dba492f0262215e6a24c716dc1995f392f40ca1196dea992f82d45f5
+  data.tar.gz: 9c415cc56d0c23df319c57c3b20f8d4ee2d3cdfcd490379453f476b16e6dafc7
 SHA512:
-  metadata.gz: d891a5eb61264bd27a9569b27d307e5f276bed2d594260796857e39978a99b9bcdf87e6aa5f5fa872a4dab765fa1fa6abc5dc75a96a6aa5f43dc751cdee5a4cc
-  data.tar.gz: a3f5eddbe0b5a4b5604f75b8d20feb117009b791fa9ab8ac8b6608515c26442ffee2b8d70a1220996d079d0e1c0bc1703180fb72f34e86ddcaffb666438aa145
+  metadata.gz: cc35a426aeef14b77d7e034c8c801f9f03ce6e9fc48982be89475ee9c581723df017a489fe8b6c3920ded1c237868b57f27061dd4fd6f43a121f45cb9d99cd33
+  data.tar.gz: 2d20d88426797545d7bf51bbf09902a5229df623c98c19df4729a3864df3f47758a5488551e12abff7c595444e2c6caa62d38cb63d28badefe241ff8c0843ab5

data/lib/cocoapods_plugin.rb

@@ -4,7 +4,7 @@ require 'swordfish/hmap'
 require 'swordfish/native/target_architectures'
 
 module Ocean
-  Pod::HooksManager.register('cocoapods-swordfish', :post_install) do |post_context, user_options|
+  Pod::HooksManager.register('cocoapods-swordfish', :post_install) do |post_context|
     if $hmap_enable
       generate_type = $strict_mode ? HmapGenerator::ANGLE_BRACKET : HmapGenerator::BOTH
       post_context.aggregate_targets.each do |one|
@@ -19,15 +19,10 @@ module Ocean
         end
         one.save_hmap(pods_hmap)
       end
-      # arm64
-      Xcodeproj::Project.set_archs_arm64(post_context, $archs_only_arm64)
-      # m1 EXCLUDED_ARCHS
-      Pod::Target.excluded_archs_simulator(post_context, $excluded_archs_simulator)
+
+      Pod::Target.set_archs(post_context, $archs_only_arm64)
     else
-      # arm64
-      Xcodeproj::Project.set_archs_arm64(post_context, $archs_only_arm64)
-      # m1 EXCLUDED_ARCHS
-      Pod::Target.excluded_archs_simulator(post_context, $excluded_archs_simulator)
+      Pod::Target.set_archs(post_context, $archs_only_arm64)
     end
   end
 

data/lib/gem_version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ocean
-  VERSION = "0.1.7"
+  VERSION = "1.0.1"
 end
 
 module Pod

data/lib/swordfish/config/config.rb

@@ -13,7 +13,7 @@ module Ocean
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
           #'code_repo_url' => { description: '源码私有源 Git 地址', default: 'https://gitlab.lizhi.fm/iOSPods/pod_binary_spec_source.git' },
-          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'https://gitlab.lizhi.fm/iOSPods/pod_binary_spec.git' },
+          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@gitlab.lizhi.fm:iOSPods/pod_binary_spec.git' },
           'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://192.168.33.15:8080/frameworks/%s/%s/zip' },
           # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },
           'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }

data/lib/swordfish/helpers/framework_builder.rb

@@ -147,7 +147,7 @@ module Ocean
       end
 
       def ios_build_options
-        "ARCHS=\'#{ios_architectures.join(' ')}\' "
+        "ARCHS=\'#{ios_architectures.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
       end
 
       def ios_architectures
@@ -163,8 +163,8 @@ module Ocean
         #   iphone5,iphone5s以下的模拟器
         # >x86_64
         #   iphone6以上的模拟器
-        # archs = %w[x86_64 arm64 armv7s i386]
         archs = %w[arm64 armv7]
+        # archs = %w[x86_64 arm64 armv7s i386]
         # @vendored_libraries.each do |library|
         #   archs = `lipo -info #{library}`.split & archs
         # end
@@ -188,7 +188,7 @@ module Ocean
         archs = ios_architectures
         # archs = %w[arm64 armv7 armv7s]
         archs.map do |arch|
-          xcodebuild(defines, "ARCHS=\'#{arch}\' ","build-#{arch}",@build_model)
+          xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
         end
         # else
         # xcodebuild(defines,options)
@@ -212,6 +212,7 @@ module Ocean
       end
 
       def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
+
         unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
           command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
         else
@@ -219,8 +220,7 @@ module Ocean
         end
 
         UI.message "command = #{command}"
-        output_str = `#{command}`
-        output = output_str.lines.to_a
+        output = `#{command}`.lines.to_a
 
         if $CHILD_STATUS.exitstatus != 0
           raise <<~EOF
@@ -368,7 +368,7 @@ module Ocean
 
       def copy_resources
         resource_dir = './build/*.bundle'
-        # resource_dir = './build-armv7/*.bundle' if File.exist?('./build-armv7')
+        resource_dir = './build-armv7/*.bundle' if File.exist?('./build-armv7')
         resource_dir = './build-arm64/*.bundle' if File.exist?('./build-arm64')
 
         bundles = Dir.glob(resource_dir)

data/lib/swordfish/native/podfile.rb

@@ -3,7 +3,6 @@ require 'cocoapods'
 require 'swordfish/native/podfile_env'
 
 $archs_only_arm64 = false
-$excluded_archs_simulator = false
 
 module Pod
   class Podfile
@@ -14,10 +13,6 @@ module Pod
         $archs_only_arm64 = true
       end
 
-      def set_excluded_archs_simulator
-        $excluded_archs_simulator = true
-      end
-
       def allow_prerelease
         set_internal_hash_value(ALLOW_PRERELEASE, true)
       end

data/lib/swordfish/native/resolver.rb

@@ -116,6 +116,15 @@ module Pod
                               end
 
           # Parallel.map(rspecs, in_threads: 8) do |rspec|
+
+          # 当不开启use_binaries时
+          if use_binary_rspecs.empty?
+            specs_by_target[target] = rspecs.map do |rspec|
+              rspec
+            end
+            next
+          end
+
           specs_by_target[target] = rspecs.map do |rspec|
             # 含有 subspecs 的组件暂不处理
             # next rspec if rspec.spec.subspec? || rspec.spec.subspecs.any?
@@ -126,7 +135,6 @@ module Pod
             #   next rspec
             # end
             #
-            #
 
             spec_version = rspec.spec.version
             UI.message 'cocoapods-swordfish 插件'
@@ -135,19 +143,24 @@ module Pod
             # 采用二进制依赖并且不为开发组件
             use_binary = use_binary_rspecs.include?(rspec)
 
-            # source = sources_manager.binary_source
-            # # 采用非二进制
-            # unless use_binary
-            #   # missing_binary_specs << rspec.spec
-            #   # next rspec
-            #   source = @aggregate.sources.select { |s|
-            #     logger.info ""
-            #   }
-            # end
-
             # 只实现二进制效果
             # source = use_binary ? sources_manager.binary_source : sources_manager.code_source
+            # 非二进制遍历取podfile中的source
             source = sources_manager.binary_source
+            if !use_binary
+              @sources.uniq.each do |s|
+                next if s.name == source.name
+                begin
+                  specification = s.specification(rspec.root.name, spec_version)
+                  if specification != nil
+                    source = s
+                    break
+                  end
+                rescue Pod::StandardError => e
+                  # 无
+                end
+              end
+            end
 
             begin
               # 从新 source 中获取 spec,在bin archive中会异常，因为找不到
@@ -161,23 +174,11 @@ module Pod
               # 造成 subspec_by_name 返回 nil，这个是正常现象
               next unless specification
 
-              used_by_only = if Pod.match_version?('~> 1.7')
-                               rspec.used_by_non_library_targets_only
-                             else
-                               rspec.used_by_tests_only
-                             end
-              # used_by_only = rspec.respond_to?(:used_by_tests_only) ? rspec.used_by_tests_only : rspec.used_by_non_library_targets_only
-              # 组装新的 rspec ，替换原 rspec
-              if use_binary
-                rspec = ResolverSpecification.new(specification, used_by_only, source)
-                UI.message "组装新的 rspec ，替换原 rspec #{rspec.root.name} #{spec_version} \r\n specification =#{specification} \r\n #{rspec} "
-
-              end
+              used_by_only = rspec.used_by_non_library_targets_only
+              rspec = ResolverSpecification.new(specification, used_by_only, source)
 
             rescue Pod::StandardError => e
               # 没有从新的 source 找到对应版本组件，直接返回原 rspec
-
-              # missing_binary_specs << rspec.spec if use_binary
               missing_binary_specs << rspec.spec
               rspec
             end

data/lib/swordfish/native/target_architectures.rb

@@ -1,24 +1,24 @@
 
 module Pod
   class Target
-    def self.excluded_archs_simulator(post_context, is_arm64)
+    def self.set_archs(post_context, is_only_arm64)
       post_context.aggregate_targets.each do |one|
         one.pod_targets.each { |target|
-          target.excluded_archs_simulator(is_arm64)
+          target.loop_set_archs(is_only_arm64)
         }
-        one.excluded_archs_simulator(is_arm64)
+        one.set_archs(is_only_arm64)
       end
     end
   end
 
   class PodTarget
-    def excluded_archs_simulator(is_arm64)
+    def loop_set_archs(is_arm64)
       build_settings.each do |config_name, setting|
         config_file = setting.xcconfig
         if is_arm64
-          config_file.set_excluded_archs_simulator
+          config_file.set_archs_arm64
         else
-          config_file.set_excluded_archs_simulator_default
+          config_file.set_archs_default
         end
         config_path = xcconfig_path(config_name)
         config_file.save_as(config_path)
@@ -27,12 +27,12 @@ module Pod
   end
 
   class AggregateTarget
-    def excluded_archs_simulator(is_arm64)
+    def set_archs(is_arm64)
       xcconfigs.each do |config_name, config_file|
         if is_arm64
-          config_file.set_excluded_archs_simulator
+          config_file.set_archs_arm64
         else
-          config_file.set_excluded_archs_simulator_default
+          config_file.set_archs_default
         end
         config_path = xcconfig_path(config_name)
         config_file.save_as(config_path)
@@ -43,37 +43,12 @@ end
 
 module Xcodeproj
   class Config
-    def set_excluded_archs_simulator_default
-      remove_attr_with_key('EXCLUDED_ARCHS[sdk=iphonesimulator*]"')
+    def set_archs_default
+      remove_attr_with_key('ARCHS')
     end
 
-    def set_excluded_archs_simulator
-      @attributes["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = 'arm64'
-    end
-  end
-
-  class Project
-    def self.set_archs_arm64(post_context, is_arm64)
-      temp_project = post_context.umbrella_targets.first.user_project
-      temp_project.targets.each do | target |
-        build_configurations = target.build_configurations
-        build_configurations.each do | config |
-          config.set_archs(is_arm64)
-        end
-      end
-      temp_project.save
-    end
-
-    module Object
-      class XCBuildConfiguration
-        def set_archs(is_arm64)
-          if is_arm64
-            build_settings['ARCHS'] = "arm64"
-          else
-            build_settings['ARCHS'] = "$(ARCHS_STANDARD)"
-          end
-        end
-      end
+    def set_archs_arm64
+      @attributes['ARCHS'] = 'arm64'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-swordfish
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.1
 platform: ruby
 authors:
-- yuanli
+- lizhi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: swordfish是一款支持pod二进制化,hmap优化等特性的cocoapods插件.
 email:
-- yuanli_kk925@163.com
+- ios@lizhi.fm
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -140,11 +140,10 @@ files:
 - lib/swordfish/native/target_architectures.rb
 - lib/swordfish/native/target_validator.rb
 - lib/swordfish/native/validator.rb
-homepage: http://rubygems.org/gems/cocoapods-swordfish
+homepage: https://github.com/EXAMPLE/swordfish
 licenses: []
 metadata:
-  allowed_push_host: https://rubygems.org
-  homepage_uri: http://rubygems.org/gems/cocoapods-swordfish
+  homepage_uri: https://github.com/EXAMPLE/swordfish
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -160,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: swordfish编译加速插件.