cocoapods-bb-PodAssistant 0.1.9.1 → 0.1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6c32b006b3836cba11f001d3ebc24c707f3bd473a35156cfaf3bceae50f4528
-  data.tar.gz: 447a74c6907306dfdacf90685572eeea587b97e0e20ad61c0ccebf7001f4ca69
+  metadata.gz: 32ae7a754051168b335839ef24e3241e10ae8c1ce9772b65ae1add131a591744
+  data.tar.gz: fabd94ec00e74cd9b40dcbbf176baca21d88e54d640ddaf82b3c085520649807
 SHA512:
-  metadata.gz: b0f45f73957e38a0007348067cbcbc39d65a1a533ffe0ba5a349d82134909f3e51bdc72e062adfcecc7b184ddc3da11df2cc2dd2041740331f6216ebe53a8a27
-  data.tar.gz: ea3629e578813651181a761037a0d4ec02a25b0003c6e24cca1574de0e1fd3b82a0e0ec0fc4f028b2e5fc91da44019c64e2eff3cecd80bab4cf44a1f7913a073
+  metadata.gz: 3945a8e16d272daa2b8a13e6fa412127bd055b1f85f97b6dbee51c56df0465dce8a8403d913139bb669239e1c7926341e6f8e5a7a60f619b49f614983cb1f387
+  data.tar.gz: 1d27d7075c0fae3e206182a07b2c061f2d1f67907083ff938084ed34d4bc4d872d19d6a55a1e09abfaaf3879b99ec47ec3fd2c101ff10e1eb617c9598ff23509

data/lib/cocoapods-bb-PodAssistant/babybus/business/babybus_install_environment.rb

@@ -13,12 +13,16 @@ class BabybusInstallEnv
         rootPath = getProjectRootPath
         bundleIdentifier = getProjectBundleIdentifier
         path = File.join(rootPath, "Configs", "#{bundleIdentifier}/BBPlistMacro.h")
+        puts "查找PlistMacro文件1:#{path}"
         if !File.file?(path)
             path = File.join(rootPath, "Configs/PlistMacro", "#{bundleIdentifier}/BBPlistMacro.h")
+            puts "查找PlistMacro文件2:#{path}"
             if !File.file?(path)
                 path = File.join(rootPath, "Configs/PlistMacro", "#{bundleIdentifier}_BBPlistMacro.h")
+                puts "查找PlistMacro文件3:#{path}"
                 if !File.file?(path)
                     path = File.join(rootPath, "Configs/PlistMacro", "BBPlistMacro.h")
+                    puts "查找PlistMacro文件4:#{path}"
                 end
             end
         end
@@ -51,12 +55,16 @@ class BabybusInstallEnv
         rootPath = getProjectRootPath
         bundleIdentifier = getProjectBundleIdentifier
         path = File.join(rootPath, "Configs", "#{bundleIdentifier}/UnityFramework.framework")
+        puts "查找UnityFramework产物1:#{path}"
         if !File.file?(path)
             path = File.join(rootPath, "Configs/UnityFramework", "#{bundleIdentifier}/UnityFramework.framework")
+            puts "查找UnityFramework产物2:#{path}"
             if !File.directory?(path)
                 path = File.join(rootPath, "Configs/UnityFramework", "#{bundleIdentifier}_UnityFramework.framework")
+                puts "查找UnityFramework产物3:#{path}"
                 if !File.directory?(path)
                     path = File.join(rootPath, "Configs/UnityFramework", "UnityFramework.framework")
+                    puts "查找UnityFramework产物4:#{path}"
                 end
             end
         end
@@ -78,7 +86,7 @@ class BabybusInstallEnv
             system "rm -rf #{replaceFilePath}; cp -af #{path} #{replaceFilePath}"
             puts "替换UnityFramework文件成功".yellow
         else
-            puts "找不到UnityFramework配置文件，替换失败path:#{path}".red
+            puts "找不到UnityFramework产物文件，替换失败".red
         end
     end
     # 2D母包替换

data/lib/cocoapods-bb-PodAssistant/babybus/helpers/babybus_info_plist_helper.rb

@@ -24,12 +24,20 @@ def forceAddDebugTool
     forceAddDebugTool = BB::PodUtils.getValueFromInfoPlist("ForceAddDebugTool")
     return forceAddDebugTool === "true"
 end
-# 是否3d产品
+# 是否3d产品(968开始切新版unity2022引擎)
 def isUnity3DApp
-    isU3dValue = BB::PodUtils.getValueFromInfoPlist("Unity3D")
-    return isU3dValue === "true"
+    if isUnityApp
+        # 1=>Cocos2D; 2=>Unity2D; 3=>普通 Unity3D; 4=>新版 Unity 3D; 5=>2D融合 打包机负责写入
+        value = BB::PodUtils.getValueFromInfoPlist("packer_engines_id")
+        return value === "4"
+    end
+    return false
+end
+# 是否unity产品，包含2d/3d
+def isUnityApp
+    value = BB::PodUtils.getValueFromInfoPlist("Unity3D")
+    return value === "true"
 end
-
 # 是否需要第三方支付sdk
 def isThirdPaySdk
     value = BB::PodUtils.getValueFromInfoPlist("Third_Purcharse")

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

@@ -7,36 +7,46 @@ require 'cocoapods-bb-PodAssistant/babybus/business/babybus_install_environment'
 require 'cocoapods-bb-PodAssistant/helpers/pod_utils'
 
 class PodPostInstaller
-    def initialize(lib, deployment_target="11.0", unity_deployment_target="11.0")
-      @lib = lib
-      @deployment_target = deployment_target
-      @unity_deployment_target = unity_deployment_target
+    def initialize(lib, deployment_target=nil)
+        @lib = lib
+        puts "====isUnity3DApp:#{isUnity3DApp}".red
+        if deployment_target.nil?
+            @deployment_target = isUnity3DApp ? "12.0" : "11.0" # Unity2022引擎最低支持iOS12.0
+        else
+            @deployment_target = deployment_target
+        end
     end
     def run
         env = BabybusInstallEnv.new()
         is_xcode15 = BB::PodUtils.compare_xcode_15_version
         # 是否Untify项目
-        isUnityProject = isUnity3DApp
-        
+        isUnityProject = isUnityApp
         # Untify项目需要移除cocos项目res/src目录
         if (isUnityProject) then
             env.createCocosResource
         end
-        ios_deployment_target = isUnityProject ? @unity_deployment_target : @deployment_target
-        puts "当前工程最低支持iOS系统===>#{ios_deployment_target.to_s.send(:red)}".green
+        ios_deployment_target = @deployment_target
+        puts "当前工程最低支持iOS系统 ===> #{ios_deployment_target.to_s.send(:red)}".green
         @lib.aggregate_targets.first.user_project.save # 解决Xcode13 pod update操作出现failed to save pods.xcodeproj问题 by hm 21/11/8
         project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
         project.targets.each do |target|
             target.build_configurations.each do |config|
-                if config.name.include? 'Debug' # 只有debug环境才进行替换操作，其它环境交由打包机处理
-                    puts "[#{target.name}/#{config.name}] 环境替换PlistMacro文件操作!!!开发者debug环境自行打开👇替换操作，禁止提交版本控制，谢谢🙏"
-                    env.copyPlistMacro # 开发自行打开不能提交到版本控制，避免test包出现配置不正确情况 by hm 22/5/17
-                end
-                # iOS17适配添加ld64
-                if (is_xcode15 == true) then
-                    config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -ld64"
-                else
-                    config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++"
+                if !target.name.include? '_test' # 过滤target test 工程
+                    if 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
+                            env.copyUnityFramework
+                        else
+                            env.copyCocosPackage
+                        end
+                    end
+                    # iOS17适配添加ld64
+                    if (is_xcode15 == true) then
+                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -ld64"
+                    else
+                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++"
+                    end
                 end
             end
         end

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.1.9.1"
+  VERSION = "0.1.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.1.9.1
+  version: 0.1.9.2
 platform: ruby
 authors:
 - humin