Skip to content

Commit 8ad827d

Browse files
authored
Merge pull request #1195 from mendix/moo/MOO-2275-support-xcode-26.4
[MOO-2275]: fix the issue while building in xcode 26.4
2 parents 5b9dfb7 + 97fdc1b commit 8ad827d

3 files changed

Lines changed: 58 additions & 12 deletions

File tree

ios/Podfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,18 @@ post_install do |installer|
100100
# :ccache_enabled => true
101101
)
102102

103+
installer.pods_project.targets.each do |target|
104+
if target.name == 'fmt'
105+
target.build_configurations.each do |config|
106+
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)']
107+
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'FMT_USE_CONSTEXPR=0'
108+
config.build_settings['OTHER_CPLUSPLUSFLAGS'] ||= ['$(inherited)']
109+
config.build_settings['OTHER_CPLUSPLUSFLAGS'] << '-Wno-invalid-constexpr'
110+
config.build_settings['CLANG_CXX_LANGUAGE_STANDARD'] = 'c++23'
111+
end
112+
end
113+
end
114+
103115
installer.pods_project.build_configurations.each do |config|
104116
config.build_settings['OTHER_LDFLAGS'] ||= ['$(inherited)']
105117
if config.name == "Debug"

ios/Podfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PODS:
33
- DoubleConversion (1.1.6)
44
- fast_float (8.0.0)
55
- FBLazyVector (0.83.4)
6-
- fmt (11.0.2)
6+
- fmt (12.1.0)
77
- glog (0.3.5)
88
- hermes-engine (0.14.1):
99
- hermes-engine/Pre-built (= 0.14.1)
@@ -90,20 +90,20 @@ PODS:
9090
- boost
9191
- DoubleConversion
9292
- fast_float (= 8.0.0)
93-
- fmt (= 11.0.2)
93+
- fmt (= 12.1.0)
9494
- glog
9595
- RCT-Folly/Default (= 2024.11.18.00)
9696
- RCT-Folly/Default (2024.11.18.00):
9797
- boost
9898
- DoubleConversion
9999
- fast_float (= 8.0.0)
100-
- fmt (= 11.0.2)
100+
- fmt (= 12.1.0)
101101
- glog
102102
- RCT-Folly/Fabric (2024.11.18.00):
103103
- boost
104104
- DoubleConversion
105105
- fast_float (= 8.0.0)
106-
- fmt (= 11.0.2)
106+
- fmt (= 12.1.0)
107107
- glog
108108
- RCTDeprecation (0.83.4)
109109
- RCTRequired (0.83.4)
@@ -3375,9 +3375,9 @@ PODS:
33753375
- ReactCommon/turbomodule/core
33763376
- SocketRocket
33773377
- Yoga
3378-
- SDWebImage (5.21.7):
3379-
- SDWebImage/Core (= 5.21.7)
3380-
- SDWebImage/Core (5.21.7)
3378+
- SDWebImage (5.21.5):
3379+
- SDWebImage/Core (= 5.21.5)
3380+
- SDWebImage/Core (5.21.5)
33813381
- SDWebImageAVIFCoder (0.11.1):
33823382
- libavif/core (>= 0.11.0)
33833383
- SDWebImage (~> 5.10)
@@ -3721,17 +3721,17 @@ SPEC CHECKSUMS:
37213721
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
37223722
fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
37233723
FBLazyVector: 82d1d7996af4c5850242966eb81e73f9a6dfab1e
3724-
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
3724+
fmt: 530618a01105dae0fa3a2f27c81ae11fa8f67eac
37253725
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
3726-
hermes-engine: f0df085cfabcd45fd6ac1f5e78b5c86a15a96b4f
3726+
hermes-engine: 8cd282a9f635f8fbef90a93e9ea941fde056f5fb
37273727
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
37283728
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
37293729
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
37303730
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
37313731
MendixNative: 6797c879017115950e255901676934a272fb8102
37323732
op-sqlite: 64000c0da2357c4d73faf4d23ff34dd1ddb332d4
37333733
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
3734-
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
3734+
RCT-Folly: b29feb752b08042c62badaef7d453f3bb5e6ae23
37353735
RCTDeprecation: 9da1d0cf93db23ca8b41e8efe9ae558fd9c0077f
37363736
RCTRequired: 92a63c7041031a131fa5206eb082d53f95729b79
37373737
RCTSwiftUI: 395b65655229fa2006415207adcfcb6e35dc78ed
@@ -3822,14 +3822,14 @@ SPEC CHECKSUMS:
38223822
RNScreens: 7f643ee0fd1407dc5085c7795460bd93da113b8f
38233823
RNSVG: 595abfa0f9ac26d56afcaaedf4e37a00f54cab71
38243824
RNWorklets: a3184955a41f2be46898a937e2821469c8c8da42
3825-
SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
3825+
SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
38263826
SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
38273827
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
38283828
SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
38293829
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
38303830
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
38313831
Yoga: b669e79fa0f8d3f6f5e35372345f54b99e06b13c
38323832

3833-
PODFILE CHECKSUM: 37de1d89d154e6ad0ee7250f23597e3a54110286
3833+
PODFILE CHECKSUM: ac641a218166770d61ce6286d443e42497d1d22c
38343834

38353835
COCOAPODS: 1.16.2

patches/react-native+0.83.4.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,37 @@ index 95dbf82..b1b5f9f 100644
109109
[self
110110
addRequestHandler:^(NSDictionary<NSString *, id> *request, RCTPackagerClientResponder *responder) {
111111
[handler handleRequest:request withResponder:responder];
112+
diff --git a/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec b/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
113+
index 8852179..040c4f0 100644
114+
--- a/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
115+
+++ b/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
116+
@@ -25,7 +25,7 @@ Pod::Spec.new do |spec|
117+
spec.dependency "DoubleConversion"
118+
spec.dependency "glog"
119+
spec.dependency "fast_float", "8.0.0"
120+
- spec.dependency "fmt", "11.0.2"
121+
+ spec.dependency "fmt", "12.1.0"
122+
spec.compiler_flags = '-Wno-documentation -faligned-new'
123+
spec.source_files = 'folly/String.cpp',
124+
'folly/Conv.cpp',
125+
diff --git a/node_modules/react-native/third-party-podspecs/fmt.podspec b/node_modules/react-native/third-party-podspecs/fmt.podspec
126+
index 2f38990..a40c575 100644
127+
--- a/node_modules/react-native/third-party-podspecs/fmt.podspec
128+
+++ b/node_modules/react-native/third-party-podspecs/fmt.podspec
129+
@@ -8,14 +8,14 @@ fmt_git_url = fmt_config[:git]
130+
131+
Pod::Spec.new do |spec|
132+
spec.name = "fmt"
133+
- spec.version = "11.0.2"
134+
+ spec.version = "12.1.0"
135+
spec.license = { :type => "MIT" }
136+
spec.homepage = "https://github.com/fmtlib/fmt"
137+
spec.summary = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams."
138+
spec.authors = "The fmt contributors"
139+
spec.source = {
140+
:git => fmt_git_url,
141+
- :tag => "11.0.2"
142+
+ :tag => "12.1.0"
143+
}
144+
spec.pod_target_xcconfig = {
145+
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),

0 commit comments

Comments
 (0)