cocoapods-bb-PodAssistant 0.3.13.7 → 0.3.13.9
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:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: abec00e48ec639b98614704c2de363bcdbc877221b5a1b353daec7f52bdaf19e
|
|
4
|
+
data.tar.gz: 70064497c44c232d192d21714910e091d1791cf3174d6031f0261ef02022aa21
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a0c0a04aee990b1a4da82c388a3762077d55dafe774a83c050de1c81b9e82ba80ff01d516f5b4b7cbc1ffbe108a7f1bafdd4e6b414caaf4721e44e01b5890a1e
|
|
7
|
+
data.tar.gz: 32b823a32a8ebaebe6bb9547e772a2fda950e5c7d3263f9f07a6e973acfc3956493a812e9c506f1ecdecda05acd20c51b0e39318745d999360e69bf7abbca3d4
|
|
@@ -120,7 +120,7 @@ class PodPostInstaller
|
|
|
120
120
|
|
|
121
121
|
def run
|
|
122
122
|
env = BabybusInstallEnv.new()
|
|
123
|
-
|
|
123
|
+
is_above_xcode26 = BB::PodUtils.above_xcode_26_version # 高于26
|
|
124
124
|
# is_above_xcode15 = BB::PodUtils.compare_xcode_15_version # 高于15
|
|
125
125
|
# is_below_xcode15 = BB::PodUtils.below_xcode_15_version # 低于15
|
|
126
126
|
# 是否Untify项目
|
|
@@ -130,11 +130,11 @@ class PodPostInstaller
|
|
|
130
130
|
env.createCocosResource
|
|
131
131
|
end
|
|
132
132
|
ios_deployment_target = @deployment_target
|
|
133
|
-
puts "pod组件配置工程最低支持iOS系统 ===> #{ios_deployment_target.to_s.send(:red)}".
|
|
133
|
+
puts "pod组件配置工程最低支持iOS系统 ===> #{ios_deployment_target.to_s.send(:red)}".yellow
|
|
134
134
|
@lib.aggregate_targets.first.user_project.save # 解决Xcode13 pod update操作出现failed to save pods.xcodeproj问题 by hm 21/11/8
|
|
135
135
|
project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
|
|
136
136
|
should_save = false
|
|
137
|
-
|
|
137
|
+
base_ldflags = generate_other_ldflags()
|
|
138
138
|
project.targets.each do |target|
|
|
139
139
|
target.build_configurations.each do |config|
|
|
140
140
|
# if !target.name.include? 'test'
|
|
@@ -149,14 +149,28 @@ class PodPostInstaller
|
|
|
149
149
|
end
|
|
150
150
|
end
|
|
151
151
|
# xcode_version = `xcrun xcodebuild -version | grep Xcode | cut -d' ' -f2`.to_f if xcode_version ≥ 15
|
|
152
|
+
new_ldflags = base_ldflags.dup
|
|
152
153
|
key = 'OTHER_LDFLAGS'
|
|
153
|
-
|
|
154
|
-
|
|
154
|
+
# origin_flags = Array(config.build_settings[key]).join(' ').strip
|
|
155
|
+
origin_flags = Array(config.build_settings[key]).dup
|
|
156
|
+
# 确保 inherited 在
|
|
157
|
+
origin_flags.unshift('$(inherited)') unless origin_flags.include?('$(inherited)')
|
|
158
|
+
linkmap_flag = '-Wl,-map,$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME)-LinkMap-$(CURRENT_VARIANT)-$(CURRENT_ARCH).txt'
|
|
159
|
+
if config.name.include?('Debug')
|
|
160
|
+
new_ldflags << linkmap_flag unless new_ldflags.include?(linkmap_flag)
|
|
161
|
+
else
|
|
162
|
+
new_ldflags.delete(linkmap_flag)
|
|
163
|
+
end
|
|
164
|
+
# puts "====#{target.name}-#{config.name} beigin====="
|
|
165
|
+
# puts "origin_flags:#{origin_flags}"
|
|
166
|
+
# puts "new_ldflags:#{new_ldflags}"
|
|
167
|
+
# puts "=====#{target.name}-#{config.name} end====="
|
|
168
|
+
if origin_flags != new_ldflags
|
|
155
169
|
config.build_settings[key] = new_ldflags
|
|
156
170
|
should_save = true
|
|
157
|
-
puts "[Updated] #{target.name} #{config.name}: OTHER_LDFLAGS changed Value: #{new_ldflags}".
|
|
171
|
+
puts "[Updated] #{target.name} #{config.name}: OTHER_LDFLAGS changed Value: #{new_ldflags}".yellow
|
|
158
172
|
else
|
|
159
|
-
puts "[Skipped] #{target.name} #{config.name}: already up-to-date"
|
|
173
|
+
puts "[Skipped] #{target.name} #{config.name}: already up-to-date"
|
|
160
174
|
end
|
|
161
175
|
# 配置工程最低部署
|
|
162
176
|
origin_value = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
|
|
@@ -221,6 +235,12 @@ class PodPostInstaller
|
|
|
221
235
|
else
|
|
222
236
|
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = "$(inherited) $(OTHER_CFLAGS) -fmodules -fcxx-modules"
|
|
223
237
|
end
|
|
238
|
+
# Xcode26写入自定义宏
|
|
239
|
+
if (is_above_xcode26 == true) then
|
|
240
|
+
config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = "$(inherited) USING_XCODE_26"
|
|
241
|
+
else
|
|
242
|
+
config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = "$(inherited)"
|
|
243
|
+
end
|
|
224
244
|
end
|
|
225
245
|
# 修复警告 Run script build phase '[CP] Copy Pods Resources' will be run during every build because it does not specify any outputs
|
|
226
246
|
fix_phases = target.shell_script_build_phases.find { |x| x.name == '[CP] Copy XCFrameworks' || 'Create Symlinks to Header Folders' }
|