cocoapods-bb-PodAssistant 0.3.5.1 → 0.3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59dcc2483cb31282edbc5c6bb398bfb02176a5224b24bee4adbcc9ca13c4666e
-  data.tar.gz: '062378b4abbd095939268a5e947d38a57e3fee6a515b14454220071440def7b4'
+  metadata.gz: 7c5a744f1e5a5eab653a659ce0e7cff34f672821555461404b7283f8429f2b83
+  data.tar.gz: 85a9b0704feba8af63c7d8c665f0c70d633eb8e55b9d51929626e2eb25492308
 SHA512:
-  metadata.gz: 6a1f0a8f694db5bc67f8311bac4a7d8aa9dcd9f1d0111952d17db31a80d95abed25d115495d1a12434bd1b9ea88e4f35848e0c2a9eb8c8349047363d78e8ea77
-  data.tar.gz: 32c657b29be44d08c6e536b9b9a0e89ea5125d06b141f6830d4846b88269e405309005b8c5d67226c46c4b5746bd683af7e2aa273f65f4b27416e8b702845541
+  metadata.gz: 9c2acb038f58998ecd76e3ba8f52c9d2066c4cf5d1f1242b97b69905445873f6e3b264db04c5e41278663af1ceb5cc6dd1ffff63e28e93aa5602ba1a7abbef93
+  data.tar.gz: 6c704e5efb01271509dc78310f05e3e8a87cc9d28c5e823082291cfe0fa22ca96126db9425b3ece7a6a8abd5dbe5d77412e6dfe9c49537968b5e5c13b189166d

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

@@ -10,7 +10,7 @@ class PodPostInstaller
     def initialize(lib, deployment_target=nil, filter_targets=["test"], is_matrix=true)
         @lib = lib
         if deployment_target.nil?
-            is_xcode16 = BB::PodUtils.compare_xcode_16_version
+            is_xcode16 = BB::PodUtils.above_xcode_16_version
             if (is_xcode16 == true) then
                 @deployment_target = "13.0" # iOS18最低支持13系统
             else
@@ -37,7 +37,8 @@ class PodPostInstaller
 
     def run
         env = BabybusInstallEnv.new()
-        is_xcode15 = BB::PodUtils.compare_xcode_15_version
+        is_above_xcode15 = BB::PodUtils.compare_xcode_15_version # 高于15
+        is_below_xcode15 = BB::PodUtils.below_xcode_15_version # 低于15
         # 是否Untify项目
         isUnityProject = isUnityApp
         # Untify项目需要移除cocos项目res/src目录
@@ -46,7 +47,9 @@ class PodPostInstaller
         end
         ios_deployment_target = @deployment_target
         puts "pod组件配置工程最低支持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
+        if (is_below_xcode15 == true) then
+            @lib.aggregate_targets.first.user_project.save # 解决Xcode13 pod update操作出现failed to save pods.xcodeproj问题 by hm 21/11/8
+        end
         project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
         project.targets.each do |target|
             target.build_configurations.each do |config|
@@ -63,7 +66,7 @@ class PodPostInstaller
                     end
                     # xcode_version = `xcrun xcodebuild -version | grep Xcode | cut -d' ' -f2`.to_f   if xcode_version ≥ 15
                     # iOS17适配添加ld64 https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes
-                    if (is_xcode15 == true) then
+                    if (is_above_xcode15 == true) then
                         # c++ weak 标识 xcode15 -ld64 is deprecated, use -ld_classic instead
                         config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -Wl -ld_classic -weak_framework SwiftUI"
                     else
@@ -98,7 +101,7 @@ class PodPostInstaller
             target.build_configurations.each do |config|
                 # pod 1.13.0兼容故去除，避免
                 # 适配xcode 15 动态库报错： Error 'DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead'
-                # if (is_xcode15 == true) then
+                # if (is_above_xcode15 == true) then
                 #     xcconfig_path = config.base_configuration_reference.real_path
                 #     xcconfig = File.read(xcconfig_path)
                 #     xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
@@ -146,7 +149,9 @@ class PodPostInstaller
             if fix_phases
                 fix_phases.always_out_of_date = "1"
             end
-            project.save
+            if (is_below_xcode15 == true) then
+                project.save
+            end
         end
     end
 end

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.5.1"
+  VERSION = "0.3.6.0"
 end

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

@@ -138,6 +138,10 @@ module BB
             end
             return false
         end
+        # xcode15以下
+        def self.below_xcode_15_version
+            return !compare_xcode_15_version
+        end
         # xcode15以上
         def self.compare_xcode_15_version
             current_version = xcode_version
@@ -150,8 +154,12 @@ module BB
             end
             return false
         end
+        # xcode16以下
+        def self.below_xcode_16_version
+            return !above_xcode_16_version
+        end
         # xcode16以上
-        def self.compare_xcode_16_version
+        def self.above_xcode_16_version
             current_version = xcode_version
             if current_version.nil?
                 puts "未找到安装的Xcode版本。".red

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.3.5.1
+  version: 0.3.6.0
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7.7
+        version: 0.2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7.7
+        version: 0.2.8.1
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement