Skip to content

Commit de4db95

Browse files
authored
Merge pull request #66 from Iternio-Planning-AB/bugfix/xcode-26.4-builds-fail
fix: xcode 26.4 builds fail
2 parents ee9ce1c + 1d3424f commit de4db95

2 files changed

Lines changed: 45 additions & 11 deletions

File tree

apps/example/ios/Podfile.lock

Lines changed: 8 additions & 8 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.2)
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)
@@ -41,20 +41,20 @@ PODS:
4141
- boost
4242
- DoubleConversion
4343
- fast_float (= 8.0.0)
44-
- fmt (= 11.0.2)
44+
- fmt (= 12.1.0)
4545
- glog
4646
- RCT-Folly/Default (= 2024.11.18.00)
4747
- RCT-Folly/Default (2024.11.18.00):
4848
- boost
4949
- DoubleConversion
5050
- fast_float (= 8.0.0)
51-
- fmt (= 11.0.2)
51+
- fmt (= 12.1.0)
5252
- glog
5353
- RCT-Folly/Fabric (2024.11.18.00):
5454
- boost
5555
- DoubleConversion
5656
- fast_float (= 8.0.0)
57-
- fmt (= 11.0.2)
57+
- fmt (= 12.1.0)
5858
- glog
5959
- RCTDeprecation (0.83.2)
6060
- RCTRequired (0.83.2)
@@ -2595,7 +2595,7 @@ PODS:
25952595
- React-perflogger (= 0.83.2)
25962596
- React-utils (= 0.83.2)
25972597
- SocketRocket
2598-
- ReactNativeAutoPlay (0.3.6):
2598+
- ReactNativeAutoPlay (0.3.7):
25992599
- boost
26002600
- DoubleConversion
26012601
- fast_float
@@ -2887,11 +2887,11 @@ SPEC CHECKSUMS:
28872887
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
28882888
fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
28892889
FBLazyVector: f1200e6ef6cf24885501668bdbb9eff4cf48843f
2890-
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
2890+
fmt: 530618a01105dae0fa3a2f27c81ae11fa8f67eac
28912891
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
28922892
hermes-engine: 9d3f0c47eb6a1ab29848ec3919b5fe036e11183a
28932893
NitroModules: bbb23eb8f98f7ec57db714829b06a678419b8a02
2894-
RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
2894+
RCT-Folly: 121436bcc4611f6bde5c09bf35f0a7a82cef1969
28952895
RCTDeprecation: 3b915a7b166f7d04eaeb4ae30aaf24236a016551
28962896
RCTRequired: fcfec6ba532cfe4e53c49e0a4061b5eff87f8c64
28972897
RCTSwiftUI: b2f0c2f2761631b8cd605767536cbb1cbf8d020f
@@ -2962,7 +2962,7 @@ SPEC CHECKSUMS:
29622962
ReactAppDependencyProvider: 1976cdf5076a7e34718a56ead2f2069c7f54ebe9
29632963
ReactCodegen: c5477d4f0a2b437e5992ee088095634ce7da8e08
29642964
ReactCommon: d88059f5cba636002f007da707debdc6d0334a3b
2965-
ReactNativeAutoPlay: a53cba382b3e990f1840b3d864e9179ddd251618
2965+
ReactNativeAutoPlay: 34d5c9e67f406f102e31ded1d90c7f91074e83c1
29662966
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
29672967
Yoga: 999e8fad6d7c6c495768fc79e3410eb9300c7418
29682968

patches/react-native+0.83.2.patch

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ index 2a7519a..6ce3811 100644
1212
- (instancetype)initWithDelegate:(id<RCTTimingDelegate>)delegate;
1313
- (void)createTimerForNextFrame:(NSNumber *)callbackID
1414
diff --git a/node_modules/react-native/React/CoreModules/RCTTiming.mm b/node_modules/react-native/React/CoreModules/RCTTiming.mm
15-
index 0b36307..9352abc 100644
15+
index 14ee784..234169e 100644
1616
--- a/node_modules/react-native/React/CoreModules/RCTTiming.mm
1717
+++ b/node_modules/react-native/React/CoreModules/RCTTiming.mm
1818
@@ -101,11 +101,10 @@ static const NSTimeInterval kIdleCallbackFrameDeadline = 0.001;
@@ -170,7 +170,7 @@ index 0b36307..9352abc 100644
170170
}
171171

172172
/**
173-
@@ -397,16 +306,6 @@ RCT_EXPORT_METHOD(createTimer
173+
@@ -395,16 +304,6 @@ RCT_EXPORT_METHOD(
174174
@synchronized(_timers) {
175175
_timers[callbackID] = timer;
176176
}
@@ -187,7 +187,7 @@ index 0b36307..9352abc 100644
187187
}
188188

189189
RCT_EXPORT_METHOD(deleteTimer : (double)timerID)
190-
@@ -414,19 +313,11 @@ RCT_EXPORT_METHOD(deleteTimer : (double)timerID)
190+
@@ -412,19 +311,11 @@ RCT_EXPORT_METHOD(deleteTimer : (double)timerID)
191191
@synchronized(_timers) {
192192
[_timers removeObjectForKey:[NSNumber numberWithDouble:timerID]];
193193
}
@@ -207,3 +207,37 @@ index 0b36307..9352abc 100644
207207
}
208208

209209
@end
210+
diff --git a/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec b/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
211+
index 8852179..040c4f0 100644
212+
--- a/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
213+
+++ b/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
214+
@@ -25,7 +25,7 @@ Pod::Spec.new do |spec|
215+
spec.dependency "DoubleConversion"
216+
spec.dependency "glog"
217+
spec.dependency "fast_float", "8.0.0"
218+
- spec.dependency "fmt", "11.0.2"
219+
+ spec.dependency "fmt", "12.1.0"
220+
spec.compiler_flags = '-Wno-documentation -faligned-new'
221+
spec.source_files = 'folly/String.cpp',
222+
'folly/Conv.cpp',
223+
diff --git a/node_modules/react-native/third-party-podspecs/fmt.podspec b/node_modules/react-native/third-party-podspecs/fmt.podspec
224+
index 2f38990..a40c575 100644
225+
--- a/node_modules/react-native/third-party-podspecs/fmt.podspec
226+
+++ b/node_modules/react-native/third-party-podspecs/fmt.podspec
227+
@@ -8,14 +8,14 @@ fmt_git_url = fmt_config[:git]
228+
229+
Pod::Spec.new do |spec|
230+
spec.name = "fmt"
231+
- spec.version = "11.0.2"
232+
+ spec.version = "12.1.0"
233+
spec.license = { :type => "MIT" }
234+
spec.homepage = "https://github.com/fmtlib/fmt"
235+
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."
236+
spec.authors = "The fmt contributors"
237+
spec.source = {
238+
:git => fmt_git_url,
239+
- :tag => "11.0.2"
240+
+ :tag => "12.1.0"
241+
}
242+
spec.pod_target_xcconfig = {
243+
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),

0 commit comments

Comments
 (0)