Skip to content

Commit 63195b0

Browse files
committed
chore: Use patched ActiveSupport for CocoaPods
1 parent df88bd6 commit 63195b0

7 files changed

Lines changed: 98 additions & 86 deletions

File tree

.github/workflows/build-ios-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Ruby (bundle)
2525
uses: ruby/setup-ruby@v1
2626
with:
27-
ruby-version: 2.7.2
27+
ruby-version: 4.0.5
2828
bundler-cache: true
2929
working-directory: example
3030

.github/workflows/build-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Setup Ruby (bundle)
4949
uses: ruby/setup-ruby@v1
5050
with:
51-
ruby-version: 2.7.2
51+
ruby-version: 4.0.5
5252
bundler-cache: true
5353
working-directory: example
5454

.github/workflows/harness-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Setup Ruby (bundle)
7575
uses: ruby/setup-ruby@v1
7676
with:
77-
ruby-version: 2.7.2
77+
ruby-version: 4.0.5
7878
bundler-cache: true
7979
working-directory: example
8080

.github/workflows/update-lockfiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Ruby (bundle)
3232
uses: ruby/setup-ruby@v1
3333
with:
34-
ruby-version: 2.7.2
34+
ruby-version: 4.0.5
3535
bundler-cache: true
3636
working-directory: example/ios
3737

example/Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby ">= 2.6.10"
4+
ruby ">= 3.1.0"
55

66
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
77
gem 'cocoapods', '>= 1.16.2', '< 2.0'
8-
gem 'activesupport', '>= 6.1.7.5', '< 8.0', '!= 7.1.0'
8+
gem 'activesupport', '>= 7.2.3.1', '< 8.0'
99
gem 'xcodeproj', '>= 1.27.0', '< 2.0'
1010

11-
# Ruby 3.4.0 has removed some libraries from the standard library.
11+
# Newer Ruby releases have removed some libraries from the standard library.
1212
gem 'bigdecimal'
1313
gem 'logger'
1414
gem 'benchmark'
1515
gem 'mutex_m'
1616
gem 'nkf'
17+
gem 'tsort'

example/Gemfile.lock

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,25 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.8)
5-
activesupport (6.1.7.10)
6-
concurrent-ruby (~> 1.0, >= 1.0.2)
5+
activesupport (7.2.3.1)
6+
base64
7+
benchmark (>= 0.3)
8+
bigdecimal
9+
concurrent-ruby (~> 1.0, >= 1.3.1)
10+
connection_pool (>= 2.2.5)
11+
drb
712
i18n (>= 1.6, < 2)
8-
minitest (>= 5.1)
9-
tzinfo (~> 2.0)
10-
zeitwerk (~> 2.3)
13+
logger (>= 1.4.2)
14+
minitest (>= 5.1, < 6)
15+
securerandom (>= 0.3)
16+
tzinfo (~> 2.0, >= 2.0.5)
1117
addressable (2.9.0)
1218
public_suffix (>= 2.0.2, < 8.0)
1319
algoliasearch (1.27.5)
1420
httpclient (~> 2.8, >= 2.8.3)
1521
json (>= 1.5.1)
1622
atomos (0.1.3)
23+
base64 (0.3.0)
1724
benchmark (0.4.1)
1825
bigdecimal (3.2.2)
1926
claide (1.1.0)
@@ -55,7 +62,9 @@ GEM
5562
netrc (~> 0.11)
5663
cocoapods-try (1.2.0)
5764
colored2 (3.1.2)
58-
concurrent-ruby (1.3.3)
65+
concurrent-ruby (1.3.6)
66+
connection_pool (3.0.2)
67+
drb (2.2.3)
5968
escape (0.0.4)
6069
ethon (0.18.0)
6170
ffi (>= 1.15.0)
@@ -68,11 +77,11 @@ GEM
6877
gh_inspector (1.1.3)
6978
httpclient (2.9.0)
7079
mutex_m
71-
i18n (1.14.7)
80+
i18n (1.14.8)
7281
concurrent-ruby (~> 1.0)
7382
json (2.19.6)
7483
logger (1.7.0)
75-
minitest (5.25.4)
84+
minitest (5.27.0)
7685
molinillo (0.8.0)
7786
mutex_m (0.3.0)
7887
nanaimo (0.4.0)
@@ -82,6 +91,8 @@ GEM
8291
public_suffix (4.0.7)
8392
rexml (3.4.4)
8493
ruby-macho (2.5.1)
94+
securerandom (0.4.1)
95+
tsort (0.2.0)
8596
typhoeus (1.6.0)
8697
ethon (>= 0.18.0)
8798
tzinfo (2.0.6)
@@ -93,24 +104,24 @@ GEM
93104
colored2 (~> 3.1)
94105
nanaimo (~> 0.4.0)
95106
rexml (>= 3.3.6, < 4.0)
96-
zeitwerk (2.6.18)
97107

98108
PLATFORMS
99109
ruby
100110
universal-darwin-24
101111

102112
DEPENDENCIES
103-
activesupport (>= 6.1.7.5, < 8.0, != 7.1.0)
113+
activesupport (>= 7.2.3.1, < 8.0)
104114
benchmark
105115
bigdecimal
106116
cocoapods (>= 1.16.2, < 2.0)
107117
logger
108118
mutex_m
109119
nkf
120+
tsort
110121
xcodeproj (>= 1.27.0, < 2.0)
111122

112123
RUBY VERSION
113-
ruby 2.7.6p219
124+
ruby 3.4.9p82
114125

115126
BUNDLED WITH
116127
2.3.22

example/ios/Podfile.lock

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,7 +1451,7 @@ PODS:
14511451
- ReactCommon/turbomodule/core
14521452
- ReactNativeDependencies
14531453
- Yoga
1454-
- react-native-safe-area-context (5.8.0):
1454+
- react-native-safe-area-context (5.6.1):
14551455
- hermes-engine
14561456
- RCTRequired
14571457
- RCTTypeSafety
@@ -1463,8 +1463,8 @@ PODS:
14631463
- React-graphics
14641464
- React-ImageManager
14651465
- React-jsi
1466-
- react-native-safe-area-context/common (= 5.8.0)
1467-
- react-native-safe-area-context/fabric (= 5.8.0)
1466+
- react-native-safe-area-context/common (= 5.6.1)
1467+
- react-native-safe-area-context/fabric (= 5.6.1)
14681468
- React-NativeModulesApple
14691469
- React-RCTFabric
14701470
- React-renderercss
@@ -1475,7 +1475,7 @@ PODS:
14751475
- ReactCommon/turbomodule/core
14761476
- ReactNativeDependencies
14771477
- Yoga
1478-
- react-native-safe-area-context/common (5.8.0):
1478+
- react-native-safe-area-context/common (5.6.1):
14791479
- hermes-engine
14801480
- RCTRequired
14811481
- RCTTypeSafety
@@ -1497,7 +1497,7 @@ PODS:
14971497
- ReactCommon/turbomodule/core
14981498
- ReactNativeDependencies
14991499
- Yoga
1500-
- react-native-safe-area-context/fabric (5.8.0):
1500+
- react-native-safe-area-context/fabric (5.6.1):
15011501
- hermes-engine
15021502
- RCTRequired
15031503
- RCTTypeSafety
@@ -2152,82 +2152,82 @@ SPEC CHECKSUMS:
21522152
FBLazyVector: 24e62c765683b8d89006a88a2c8f5cf019f0074d
21532153
hermes-engine: f87521eebf2751865bc281cc0080f7ceaec32dae
21542154
MMKVCore: 3d16ce9f7d411e135020915fde98a056859a1efa
2155-
NitroMmkv: c571eeb8b8d74d7df2135af63d3c219aea2353ad
2156-
NitroModules: 8308314b644c15567ffad50bb10667e8c1d82666
2155+
NitroMmkv: 5bf1fab6f16a2ea5e7f0ff28130a644eb0b897fc
2156+
NitroModules: 16bc17a076b12304d608f7c915b9d321f56dfc19
21572157
RCTDeprecation: a4c521821fab57cbb125b36effe84d897d0dfa12
21582158
RCTRequired: 9f3a7e5645d4bc3f551593de7550bb66ab6e42bc
21592159
RCTSwiftUI: 239ed2eb9e73de5a6f518810630f0c95e01c8702
2160-
RCTSwiftUIWrapper: 7b8a1ffba8994a8f955c563511bffb74b4681317
2160+
RCTSwiftUIWrapper: 966ca7f5f22ac0b2b2255fb09cffc381f5440b03
21612161
RCTTypeSafety: 2a6403ba3492c04510e7c15bd635461646c43bb2
21622162
React: e2dc35338068bbd299c66f043ae0d7f25de8499e
21632163
React-callinvoker: 28b25d21b124c26cebaea713ba7d801b9351dc48
2164-
React-Core: f90d375d3bab515ad00df30605ce1bf02e6db12f
2164+
React-Core: 02ed7d2ffb70437bdf2aba074a13078a7b0b9ff0
21652165
React-Core-prebuilt: dc36d84d6574e057ad66761e3ceeacc68f20bbc9
2166-
React-CoreModules: da4f80202ef954bdfb926ca4c9ac5f685900aa5c
2167-
React-cxxreact: 1d1d2a28a5f10e4e2e7cf2bfd54dc9c92c68c672
2166+
React-CoreModules: b3a5a42dadcde3b5d47b325bd912eb2ced89e146
2167+
React-cxxreact: fe8f88dda044e5905e99a00f41b7a874c3908716
21682168
React-debug: 92944dc4d89f56d640e75498266cbde557a48189
2169-
React-defaultsnativemodule: 172d2ef7d11c531c40ee74f3be1ac98d258a817f
2170-
React-domnativemodule: 5a60a88075a35e20fa5879c94e7aa24e5f4071d0
2171-
React-Fabric: 5c1954e06c094623e46d51da2dc2c926621c03a5
2172-
React-FabricComponents: f32494150868073accd5d52d46b30a0496626813
2173-
React-FabricImage: dfcd2826b10f05c19e5bfa68d4937c4401c129db
2174-
React-featureflags: 84bcfcb8f91f9475e437f3dd579399085a4af51e
2175-
React-featureflagsnativemodule: 83111c4ee188b8859aaa8643c1be640442098fef
2176-
React-graphics: e0441bc695f5c682a3fb1b0fd317e10765700f12
2177-
React-hermes: da795ff5d5816d8940fca927c46dcdd81d7e9ad6
2178-
React-idlecallbacksnativemodule: b6d79e1c9e335564e17d18e2649fe7524c4e74e4
2179-
React-ImageManager: 0e137d7231092ddaa236f3520b67b4aa833e7079
2180-
React-intersectionobservernativemodule: 160b3c85bb5a3df2bf50e60619c0db50aadbef8c
2181-
React-jserrorhandler: 619d382632f5ed166541c03f7ba7deee76fb1b16
2182-
React-jsi: eac528e72d25146faa922ef1aad82d338addbb75
2183-
React-jsiexecutor: 2d3000fdde95d0da451f8976cdf9018448756023
2184-
React-jsinspector: 0377987f9635c64c5aaf72ec73aaf2b0b0da7744
2185-
React-jsinspectorcdp: 9db641a9cd0dd5b693df27d2e665ac2540ddc336
2186-
React-jsinspectornetwork: 61b00d0adfe6f175830660f1b98da576bc74eb0a
2187-
React-jsinspectortracing: 0f8d4f2ebd7523aece78cbc926cd4b6f2fc227dc
2188-
React-jsitooling: 36f3854063d507bc4d4a01227ebf1b63d9e24592
2189-
React-jsitracing: cddf044c0c2847d3f5822a984018fd5596c1d448
2190-
React-logger: 57001aefabd79d885589d2f31a8be05ccc393eaa
2191-
React-Mapbuffer: 1aa9126122d4247ffc24bf9d28d50ce923499a71
2192-
React-microtasksnativemodule: d86581169e9bb5bb6f5fc3c5052f890016c1bf21
2193-
React-mutationobservernativemodule: 9a0c4e866f1ef2a57acebc902ebacbdf469ae741
2194-
react-native-safe-area-context: c1eb308f4b36372a4de4b3bdaa8ed695ec3dd461
2195-
React-NativeModulesApple: cc6ec4767844d610e92cc358bd3ea34937438d56
2196-
React-networking: a8ce15641ed7775d5b54a9d0d32defc367c2216e
2169+
React-defaultsnativemodule: cd64bc09d7ca24112bbaf1b91edbbcf3d81ea7dc
2170+
React-domnativemodule: dacf5bc055ae041039574f38b73a20b91e368774
2171+
React-Fabric: bb0baa33d91839631d315800eb23e9aaa4338a44
2172+
React-FabricComponents: c504d0b0e2f3054b2ba19af839f175cb361153c0
2173+
React-FabricImage: 91eaea1cc58d25ae2596a9277bcfe028f92374c3
2174+
React-featureflags: 5ac0455da0af12ca79b40402e2f42c5c7556b638
2175+
React-featureflagsnativemodule: df7da181b064f10f5959a7cd529b5aab3686ecb2
2176+
React-graphics: d25b1195baf24c7918543f4aff9be89cc080906f
2177+
React-hermes: 663286153a8ad6bf752b742654c766ff5e8991e7
2178+
React-idlecallbacksnativemodule: 0bd5392cb67f1ab25df736814b7c05213b1d3c68
2179+
React-ImageManager: a03eed3e3d4222130dc0ad503a1a5f3aa89de746
2180+
React-intersectionobservernativemodule: 5d0f1c3c7b30031b0f6f730ee52dd9d607e2c966
2181+
React-jserrorhandler: d5d6e7e20c5a2d6e8607e18d31d8712d7de676f6
2182+
React-jsi: eb7cc4cffcf24796cc302d5b2bca0e92544139a9
2183+
React-jsiexecutor: 65006f60e64c72c6b82f62ef6bd17c84846e73f8
2184+
React-jsinspector: 01e32e2247b2486117fbb143db7f7717ef462c6d
2185+
React-jsinspectorcdp: f1cbb34ca41d188ba22efd9b663cf258a911f6cd
2186+
React-jsinspectornetwork: f61acc94c881c41451f508abfe6efa748b956c21
2187+
React-jsinspectortracing: 9395894d9bd4d17931b9afcf230c0e7f4cb3d674
2188+
React-jsitooling: 03ead841daa12a93b18479f5e400ceab3732d36d
2189+
React-jsitracing: 4ae61c79e14360d1c6ab566031c62c490da78439
2190+
React-logger: bf149dea4343a9037b74bade36cced8b63f03f46
2191+
React-Mapbuffer: fec3e025f0ffba6b32cd2a1d7bbdee3e269aae90
2192+
React-microtasksnativemodule: ab33a818d339f5a1da308893c11b487be66121a8
2193+
React-mutationobservernativemodule: a42d1626651ccd7d0dc02a56e69d4ec77c248893
2194+
react-native-safe-area-context: 58eeaba7cb5b8e03bfe91a655d995042f89a74df
2195+
React-NativeModulesApple: deba264b03bd79c6bd61014fa30e40321b5e443a
2196+
React-networking: 35e6070b084f435429f85c5db40b4d5b38652fe9
21972197
React-oscompat: 64a0c7ef5441855dc6e2a6afe8ba8f92aa05075e
2198-
React-perflogger: b2b0144e4ba8dd157c1e90f8ebb02d22edbd040d
2199-
React-performancecdpmetrics: 5a715ec33f2dea48a93a70db37a78b4f51f9fd5a
2200-
React-performancetimeline: c292077a6fbc7f423269b01aab0fb7cc48efe3c0
2198+
React-perflogger: ca04287f205086a1edb5c95882be7b6068458889
2199+
React-performancecdpmetrics: cf1d0a3178ccd59353cedcacbda421f40100a889
2200+
React-performancetimeline: c9771212e7a43032d6f8d5edfb58280d46a7ce1f
22012201
React-RCTActionSheet: ab545c1e7b5f1ce4f8b40b6fa06afe2869095884
2202-
React-RCTAnimation: 1f9a58c7b74c25ea4ca6e6fbd05f37cc4919097a
2203-
React-RCTAppDelegate: 856f82c57b47c1795009af585cfb7b87fe2d3b5a
2204-
React-RCTBlob: 1cb18861a19be0b4d7e44bed9315e791413399f9
2205-
React-RCTFabric: 081853d9efb9b38fa868c1ff3d60e48106fe2a24
2206-
React-RCTFBReactNativeSpec: cbc760c7a889bfce20746ca0037b97c10ea58665
2207-
React-RCTImage: 0d94b22644ca87fcb778a8fa3ffbf990bc9028df
2208-
React-RCTLinking: 881a0c6772dd05a14ab0edfea05dadb698ec8090
2209-
React-RCTNetwork: feb412861e3fff3426eb0961c2acdd96bee8dce1
2210-
React-RCTRuntime: c61b848ffadc0209fe643406370d58021bd3585d
2211-
React-RCTSettings: b6e14b8764f807ebe9be2e7f0d72be83b359ac26
2212-
React-RCTText: 1ecd4f85ff609183ebec858cf94c0f27a9dec163
2213-
React-RCTVibration: 3611aa5cb59094632b3141d72c50cbb8ce3d5b08
2202+
React-RCTAnimation: 343147a9cd68c93d0ca280799fedfc7102d76ce4
2203+
React-RCTAppDelegate: 5054754e92aaa9f8bfabe0f1022b84e46f3dcb57
2204+
React-RCTBlob: 8c7ae3422ca4e72bc64b7a0142fd730efc5d4dfb
2205+
React-RCTFabric: be458db054b206c4d8e4f20f666e75d5f2c2d420
2206+
React-RCTFBReactNativeSpec: 06db2e8d0f352d9fa23321aed1dd2cde25a3e83c
2207+
React-RCTImage: 481457bca63e039eb997f7d16c7560472f49657e
2208+
React-RCTLinking: 76cbb871240cec2dc5e7aa26c60f59e0ebbcf5a2
2209+
React-RCTNetwork: e23a778225b7672e38545d3c5c24e1f4aad6d15f
2210+
React-RCTRuntime: 93c830b3ab3f7b494bbe7ae7289784f8b07b3947
2211+
React-RCTSettings: 96196b535bef147381f96cc60ce9bda85d8be848
2212+
React-RCTText: 749ebbd1a999fd84d80f37002ea3bf597fcea6df
2213+
React-RCTVibration: 5b41a7f274757c2928845981d970916ef9e4ca14
22142214
React-rendererconsistency: 6708acd4bc39c1c5b00164370d0010d93b324c1f
2215-
React-renderercss: d4a70898381431dcc07d6deba94a7eaef0cc9058
2216-
React-rendererdebug: ad92235a960983f69183e2e59e2bce21e72c80a0
2217-
React-RuntimeApple: 53a5b8fe60b044ec6fd4d254d66b7da69314a295
2218-
React-RuntimeCore: 97e125471c0b8313db2bbeb1e9dc001a5503e979
2219-
React-runtimeexecutor: 0ff42dcf1cc4bc7a89d29532a16a7d2d3849fb2f
2220-
React-RuntimeHermes: da5a1b7e39f3db1a7b3303d75d4c5bb6cd7c0d49
2221-
React-runtimescheduler: 0e24c80f0c8b6e822a33e4ad89e0ab555704eedb
2222-
React-timing: f23e82ad46673716e34a786048414ab80f237594
2223-
React-utils: 2851415c698da4b18331f9a445825d260fffa32c
2224-
React-webperformancenativemodule: 9f29ed34f6f6c01dac688b95fd2dfcbccf3aed7a
2225-
ReactAppDependencyProvider: a54c0c9b976766e1b6d5e2bb4d1ad0d15913e9e1
2226-
ReactCodegen: 7862b98c16d5497b7c56c4821a64446a9dacddf2
2227-
ReactCommon: 3ec2a55999d296af90c24beb66c8a77dc660d3ef
2215+
React-renderercss: 80eb778756fed511d6128fc005188ac9008b0baf
2216+
React-rendererdebug: b46f338fb9d3f0bea6cf0621016c6c5a7a18e72e
2217+
React-RuntimeApple: c494b2089fad4a0c553cf63c2bb265f7eca2285d
2218+
React-RuntimeCore: b0bb151c3e2b26c6309d45d05c54aa65a6e0c094
2219+
React-runtimeexecutor: 00b18635b6216a1708f6eb35dbadfd993ec91c7b
2220+
React-RuntimeHermes: bb44c4c574ce1b9507cad2e6be015344d18b94a9
2221+
React-runtimescheduler: e1631e57209cb94b3efc29002b6a049cac3f6599
2222+
React-timing: 356b88317ca60d373b0d94b6e7a71b0a572899f5
2223+
React-utils: ccc01da318979af773259c4f6cdb1876f6f86f1a
2224+
React-webperformancenativemodule: f8b97c2cb6cfa94e92a503c09ad6d491c50a1390
2225+
ReactAppDependencyProvider: 25c9c516839be2c5e3d3344f95dc7da5f7e63fc2
2226+
ReactCodegen: e5d55b301414d3cb48738d6630b434e59cf5cc57
2227+
ReactCommon: 7dfc3250793bf36cf221096ff59e1179e13eef7f
22282228
ReactNativeDependencies: 93ae3057006336cc4a9caf4053c595d887094a1e
22292229
Yoga: 77dfa8673de2874e1855002ae59c68b8be9b007b
22302230

22312231
PODFILE CHECKSUM: ac6e3a3935879b4d187353a98679212e0e3604ce
22322232

2233-
COCOAPODS: 1.15.2
2233+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)