cocoapods-bb-PodAssistant 0.3.5.1 → 0.3.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 59dcc2483cb31282edbc5c6bb398bfb02176a5224b24bee4adbcc9ca13c4666e
4
- data.tar.gz: '062378b4abbd095939268a5e947d38a57e3fee6a515b14454220071440def7b4'
3
+ metadata.gz: 7c5a744f1e5a5eab653a659ce0e7cff34f672821555461404b7283f8429f2b83
4
+ data.tar.gz: 85a9b0704feba8af63c7d8c665f0c70d633eb8e55b9d51929626e2eb25492308
5
5
  SHA512:
6
- metadata.gz: 6a1f0a8f694db5bc67f8311bac4a7d8aa9dcd9f1d0111952d17db31a80d95abed25d115495d1a12434bd1b9ea88e4f35848e0c2a9eb8c8349047363d78e8ea77
7
- data.tar.gz: 32c657b29be44d08c6e536b9b9a0e89ea5125d06b141f6830d4846b88269e405309005b8c5d67226c46c4b5746bd683af7e2aa273f65f4b27416e8b702845541
6
+ metadata.gz: 9c2acb038f58998ecd76e3ba8f52c9d2066c4cf5d1f1242b97b69905445873f6e3b264db04c5e41278663af1ceb5cc6dd1ffff63e28e93aa5602ba1a7abbef93
7
+ data.tar.gz: 6c704e5efb01271509dc78310f05e3e8a87cc9d28c5e823082291cfe0fa22ca96126db9425b3ece7a6a8abd5dbe5d77412e6dfe9c49537968b5e5c13b189166d
@@ -10,7 +10,7 @@ class PodPostInstaller
10
10
  def initialize(lib, deployment_target=nil, filter_targets=["test"], is_matrix=true)
11
11
  @lib = lib
12
12
  if deployment_target.nil?
13
- is_xcode16 = BB::PodUtils.compare_xcode_16_version
13
+ is_xcode16 = BB::PodUtils.above_xcode_16_version
14
14
  if (is_xcode16 == true) then
15
15
  @deployment_target = "13.0" # iOS18最低支持13系统
16
16
  else
@@ -37,7 +37,8 @@ class PodPostInstaller
37
37
 
38
38
  def run
39
39
  env = BabybusInstallEnv.new()
40
- is_xcode15 = BB::PodUtils.compare_xcode_15_version
40
+ is_above_xcode15 = BB::PodUtils.compare_xcode_15_version # 高于15
41
+ is_below_xcode15 = BB::PodUtils.below_xcode_15_version # 低于15
41
42
  # 是否Untify项目
42
43
  isUnityProject = isUnityApp
43
44
  # Untify项目需要移除cocos项目res/src目录
@@ -46,7 +47,9 @@ class PodPostInstaller
46
47
  end
47
48
  ios_deployment_target = @deployment_target
48
49
  puts "pod组件配置工程最低支持iOS系统 ===> #{ios_deployment_target.to_s.send(:red)}".green
49
- @lib.aggregate_targets.first.user_project.save # 解决Xcode13 pod update操作出现failed to save pods.xcodeproj问题 by hm 21/11/8
50
+ if (is_below_xcode15 == true) then
51
+ @lib.aggregate_targets.first.user_project.save # 解决Xcode13 pod update操作出现failed to save pods.xcodeproj问题 by hm 21/11/8
52
+ end
50
53
  project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
51
54
  project.targets.each do |target|
52
55
  target.build_configurations.each do |config|
@@ -63,7 +66,7 @@ class PodPostInstaller
63
66
  end
64
67
  # xcode_version = `xcrun xcodebuild -version | grep Xcode | cut -d' ' -f2`.to_f if xcode_version ≥ 15
65
68
  # iOS17适配添加ld64 https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes
66
- if (is_xcode15 == true) then
69
+ if (is_above_xcode15 == true) then
67
70
  # c++ weak 标识 xcode15 -ld64 is deprecated, use -ld_classic instead
68
71
  config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -Wl -ld_classic -weak_framework SwiftUI"
69
72
  else
@@ -98,7 +101,7 @@ class PodPostInstaller
98
101
  target.build_configurations.each do |config|
99
102
  # pod 1.13.0兼容故去除,避免
100
103
  # 适配xcode 15 动态库报错: Error 'DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead'
101
- # if (is_xcode15 == true) then
104
+ # if (is_above_xcode15 == true) then
102
105
  # xcconfig_path = config.base_configuration_reference.real_path
103
106
  # xcconfig = File.read(xcconfig_path)
104
107
  # xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
@@ -146,7 +149,9 @@ class PodPostInstaller
146
149
  if fix_phases
147
150
  fix_phases.always_out_of_date = "1"
148
151
  end
149
- project.save
152
+ if (is_below_xcode15 == true) then
153
+ project.save
154
+ end
150
155
  end
151
156
  end
152
157
  end
@@ -1,3 +1,3 @@
1
1
  module CocoapodsBbPodassistant
2
- VERSION = "0.3.5.1"
2
+ VERSION = "0.3.6.0"
3
3
  end
@@ -138,6 +138,10 @@ module BB
138
138
  end
139
139
  return false
140
140
  end
141
+ # xcode15以下
142
+ def self.below_xcode_15_version
143
+ return !compare_xcode_15_version
144
+ end
141
145
  # xcode15以上
142
146
  def self.compare_xcode_15_version
143
147
  current_version = xcode_version
@@ -150,8 +154,12 @@ module BB
150
154
  end
151
155
  return false
152
156
  end
157
+ # xcode16以下
158
+ def self.below_xcode_16_version
159
+ return !above_xcode_16_version
160
+ end
153
161
  # xcode16以上
154
- def self.compare_xcode_16_version
162
+ def self.above_xcode_16_version
155
163
  current_version = xcode_version
156
164
  if current_version.nil?
157
165
  puts "未找到安装的Xcode版本。".red
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-bb-PodAssistant
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.5.1
4
+ version: 0.3.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - humin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-07-04 00:00:00.000000000 Z
11
+ date: 2024-08-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cocoapods-core
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 0.2.7.7
47
+ version: 0.2.8.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 0.2.7.7
54
+ version: 0.2.8.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: fastlane
57
57
  requirement: !ruby/object:Gem::Requirement