cocoapods-bb-PodAssistant 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35d02b24a30633e891421f088d9fe05c17585e9b6db05f0c337a9468b980adf5
-  data.tar.gz: 4c7ac41d4a5f98ab346dfa587a686f079af075ef434df61e5441597f84f265f7
+  metadata.gz: 3774e1b9fbb57845be46192a1fdea9d4fa85012420a0ad23f3cb51571728f0e2
+  data.tar.gz: '069de9649aaea81817c3f904baa8d2fdb7e699abc7d458432489f7e1cb6c3654'
 SHA512:
-  metadata.gz: 58d31747fb116514f4520aacf1b730d0503d7e5ca3ca136772488519871ae667dad4200fb05ae65938378e8c47268e86fad32275b794bea660a65227836eee8b
-  data.tar.gz: 32b9d36bf4238aaf709dc6bdad0feded1ba5845270d42089d6cae5490120a99a1695c755b4edffdf10c9b4b1f96f187dc6eaaa1f70320e3d4b19a9133ceb9e17
+  metadata.gz: 26313aa22faefbc6e969880f4d8060d8b6dc5731c90157d63957779702c7e391297f533b70942f90b4edc7389ff55555f9266ce7e26e12b8ca88eab636c9d8a7
+  data.tar.gz: e4c680e8d7c6b1c598014efd889cdfdee4a9a66e9f30ccdc0b0d7dc7bdb672362cab0550a515bed13f1f64688e0298de77ec665520b221e520bee06277664cc5

data/lib/cocoapods-bb-PodAssistant/babybus/installer/post_install_hooks.rb

@@ -7,14 +7,29 @@ require 'cocoapods-bb-PodAssistant/babybus/business/babybus_install_environment'
 require 'cocoapods-bb-PodAssistant/helpers/pod_utils'
 
 class PodPostInstaller
-    def initialize(lib, deployment_target=nil)
+    def initialize(lib, deployment_target=nil, filter_targets=["test"], is_matrix=true)
         @lib = lib
         if deployment_target.nil?
             @deployment_target = isUnity3DApp ? "12.0" : "11.0" # Unity2022引擎最低支持iOS12.0、unity2d iOS11 、cocos iOS10、超A产品 iOS11 （968广告厂商升级最低支持iOS11）
         else
             @deployment_target = deployment_target
         end
+        if filter_targets.is_a? Array
+            @filter_targets = filter_targets # 过滤target
+        elsif filter_targets.is_a? String
+            @filter_targets = [filter_targets] # 过滤target
+        end
+        @is_matrix = is_matrix
     end
+    private def filterTargetName(target_name)
+        for name in @filter_targets
+            if target_name.include?(name)
+                return true
+            end
+        end
+        return false
+    end
+
     def run
         env = BabybusInstallEnv.new()
         is_xcode15 = BB::PodUtils.compare_xcode_15_version
@@ -30,8 +45,9 @@ class PodPostInstaller
         project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
         project.targets.each do |target|
             target.build_configurations.each do |config|
-                if !target.name.include? '_test' # 过滤target test 工程
-                    if config.name.include? 'Debug' # 只有debug环境才进行替换操作，其它环境交由打包机处理
+                # if !target.name.include? 'test'
+                if !filterTargetName(target.name) # 过滤target test 工程
+                    if (@is_matrix == true) && (config.name.include? 'Debug') # 只有debug环境才进行替换操作，其它环境交由打包机处理
                         puts "[#{target.name}/#{config.name}] 开发者debug环境环境替换[PlistMacro/cocos/unity]文件操作，其它环境交由打包机处理".red
                         env.copyPlistMacro # 开发自行打开不能提交到版本控制，避免test包出现配置不正确情况 by hm 22/5/17
                         if (isUnityProject) then
@@ -42,7 +58,8 @@ class PodPostInstaller
                     end
                     # iOS17适配添加ld64
                     if (is_xcode15 == true) then
-                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -ld64"
+                        # xcode15 打包添加属性 -weak_framework SwiftUI，避免iOS12系统crash
+                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -ld64 -weak_framework SwiftUI"
                     else
                         config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++"
                     end

data/lib/cocoapods-bb-PodAssistant/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/cocoapods-bb-PodAssistant/helpers/pod_utils.rb

@@ -3,6 +3,7 @@
 
 require 'xcodeproj'
 require 'cocoapods'
+require 'find'
 
 module BB
     class PodUtils
@@ -76,7 +77,25 @@ module BB
             if File.exist?(path)
                 return path
             end
-            puts "无法找打工程Info.plist配置文件，工程目录:#{getProjectPath}".yellow
+            info_path = ""
+            # 定义搜索目录
+            search_dir = getProjectPath
+            # 使用 Find 模块来递归搜索目录中的文件
+            Find.find(search_dir) do |path|
+                name = File.basename(path)
+                # 排除 pods 文件夹
+                if FileTest.directory?(path) && (name == 'Pods' || name.include?('.xcodeproj') || name.include?('Tests'))
+                    Find.prune
+                elsif FileTest.file?(path) && name == 'Info.plist'
+                    # 如果找到 Info.plist 文件，则输出其路径
+                    puts "Info.plist 文件路径：#{path}"
+                    info_path = path
+                end
+            end
+            if File.exist?(info_path)
+                return info_path
+            end
+            puts "无法找打工程Info.plist配置文件，工程目录:#{getProjectPath} @hm确认".red
             return nil
             # raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
             # return path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-bb-PodAssistant.