Skip to content

Commit

Permalink
fix: enable x86 for iOS and stop excluding x86 args on both platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
Johennes committed Dec 20, 2024
1 parent b5378fa commit de9e0d2
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 57 deletions.
117 changes: 117 additions & 0 deletions example/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (7.2.2.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
claide (1.1.0)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.9.1)
logger (1.6.4)
minitest (5.25.4)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.4.0)
ruby-macho (2.5.1)
securerandom (0.4.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (>= 3.3.6, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
xcodeproj (< 1.26.0)

RUBY VERSION
ruby 3.3.5p100

BUNDLED WITH
2.5.19
3 changes: 1 addition & 2 deletions example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ android.useAndroidX=true
# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
# ./gradlew <task> -PreactNativeArchitectures=x86_64
# TODO: Add back x86 and x86_64 once we figured out how to build them
reactNativeArchitectures=armeabi-v7a,arm64-v8a
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64

# Use this property to enable support to the new architecture.
# This will allow you to use TurboModules and the Fabric render in
Expand Down
7 changes: 0 additions & 7 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,5 @@ target 'ReactNativeMatrixSdkExample' do
:mac_catalyst_enabled => false,
# :ccache_enabled => true
)

# TODO: Remove (together with EXCLUDED_ARCHS build setting in workspace) once we've figured out how to build for x86
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'x86_64'
end
end
end
end
92 changes: 46 additions & 46 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1754,61 +1754,61 @@ SPEC CHECKSUMS:
RCTTypeSafety: 7e6fe47bfb693c50d4669db1a480ca5331795f5b
React: 8e73704cdd5c7f801936776d2fc434c605a7827b
React-callinvoker: fa27d1e091e683de88f576e6a5d4efc171929a4c
React-Core: 8dd14bffcc9b877091b698e45701160669a31f91
React-CoreModules: b4437acf2ef25ce3689c84df661dc5d806559b35
React-cxxreact: 6125cd820da7e18f9ca8343b3c42ee61634a4e0d
React-Core: 948deed7fa720eeb0d901ff9e45c3719767dab5f
React-CoreModules: a11ba75f64245d12a0869203664a802c11594c43
React-cxxreact: a5ce05f8a0a1398958523f948fce00d4c8ce38ff
React-debug: f474f5c202a277f76c81bf7cf26284f2c09880d7
React-defaultsnativemodule: 7141fa704531cbf7a7e7af3bc02adfa367e831a7
React-domnativemodule: c1806b8584a53ed912012a4d8b2c6f96a84c77a3
React-Fabric: ba9636cfc7f9b77df6cb7edb2c70d0237026404b
React-FabricComponents: c408da05a4ea5ba071732245b4a7f48f904e610a
React-FabricImage: c409858f319f11709b49ffa6c5bca4faf794cb44
React-defaultsnativemodule: 41cc9a60277f1bec4b258df324e28705ac00b91a
React-domnativemodule: 4fe895d9e4aa99590700c5a5f9ff5706e9481ed7
React-Fabric: bbdcc01a98528846efacf0767567a8e76df794bb
React-FabricComponents: ab8967c5898d88f37486df0eb0111384c498d821
React-FabricImage: 7a06db59488b37f509dee73fa0b2811608a67058
React-featureflags: 929732439d139ac0662e08f009f1a51ed2b91ed3
React-featureflagsnativemodule: 02dd903d4cbe4fae0e6cd02bc32a09d30543282f
React-graphics: a5cad35307286e9f83e212834e95fef4010d03d0
React-hermes: 14aafa9630579b84c2167b563bdb8c811970a03e
React-idlecallbacksnativemodule: 69581ac44bd355acce3739c3fe380c0f6d7a6d09
React-ImageManager: 41945afb3ace0c52255057ec4ae6af6f5a23539f
React-jserrorhandler: ecbc4622df7ab3d0066a4313cde4172d45745508
React-jsi: ff383df87c7047e976a66be45df59e4e0db5346e
React-jsiexecutor: 2bb8b172f226f2f502521d33dd7666e701d45f45
React-jsinspector: 4d51b903543f21076b658ef8412f3102778dbc92
React-jsitracing: 654f4d9cb9fd99b3d96f239ceb215ae49ce28ac0
React-logger: 97c9dafae1f1a638001a9d1d0e93d431f2f9cb7b
React-Mapbuffer: 3146a13424f9fec2ea1f1462d49d566e4d69b732
React-microtasksnativemodule: 02d218c79c72d373a92a8552183f4ead0d1c6e05
React-featureflagsnativemodule: b88d53b6d63ee037c5cdefb9861edfd16b4afce1
React-graphics: 6367275cc82d631c588a7146fd8dc69ec2f447e8
React-hermes: b9bbe9c808d7ab1750ce089b243b03e4a099af63
React-idlecallbacksnativemodule: 6fff2280f860f29a3c049695d3ef04c8f70212aa
React-ImageManager: 5b001b9e974f5ba81f0645d3d799e2a20c61d91e
React-jserrorhandler: 35e5e5a5a99b7b36c3802a2d12ca86889ed5982a
React-jsi: d0d8c4019fd91d0cb4b432f2518e08dc37433a13
React-jsiexecutor: 1cdaf24e36919d899250938f0f6c79ec1a256923
React-jsinspector: 2fabeadbd0eb1cbd83a6fc2026fb38c75b200947
React-jsitracing: 7c7c89c963893efd25e0d04c23e854b9a93e0b7e
React-logger: 7b5b458327a1ff0d7e5a349430d1ed133dcebaa3
React-Mapbuffer: 0d88ad9afa9e195dd7634424bde1d38e4129e646
React-microtasksnativemodule: 17234f35d37e6ed388e18a6314210b3b9e051219
React-nativeconfig: 93fe8c85a8c40820c57814e30f3e44b94c995a7b
React-NativeModulesApple: b3e076fd0d7b73417fe1e8c8b26e3c57ae9b74aa
React-perflogger: 1c55bcd3c392137cbaf0d21d8bb87ce9a0cebb15
React-performancetimeline: e89249db10b8f7bf8f72c2e9bd471ac37d48b753
React-NativeModulesApple: a4457b73e63e983db66d66612160006bccb00ad5
React-perflogger: 3140b7778984a486db80d4d2aeaa266cae4eb8c7
React-performancetimeline: 41c100bc1299d7b150821b99cf26661c51ed9ab0
React-RCTActionSheet: 9407c795fbeee35da2dae3cd6b5c4e5da6ff8bd3
React-RCTAnimation: 7ee1c2a77aab7e5c568611d8092a994cfcbe8410
React-RCTAppDelegate: 10c2b0c434baf5a71b53d5c86c4d8d0dbd6bb380
React-RCTBlob: 761072706300d22624ec2d6bf860b77d95ebd3da
React-RCTFabric: 871d38933a94554d9e27963aa4bb67184dc7529e
React-RCTImage: b6614fde902ec9647f15236da94df2d24c40523f
React-RCTLinking: 25950eda5d5f786bfb3daf513ea7d848555a2a93
React-RCTNetwork: b69407c4119fd7a1cc07db4a94563f2546f8770d
React-RCTSettings: b310a4923446c3a8950fa866c8cf83323a9e1b87
React-RCTText: 77c6eda5be1dee657f5183f75fe0fdcdb7b2b35d
React-RCTVibration: b4889c7702aea1b07316be1ec0de2e36e9a4d077
React-RCTAnimation: 48e5c6b541fd4c7a96c333e61974c3de34bbe849
React-RCTAppDelegate: 602daadf2452a56ca54a6257052ddba89e680486
React-RCTBlob: f67be4e0fbe51db1574aec402754054ab9c39668
React-RCTFabric: ee6706069cbc4e1ffd5f23553e999a42b08414f7
React-RCTImage: 57894a0e42502461d87449bec6cb0f124a49a93b
React-RCTLinking: abd71677bc3353327bec26b0ccd0a0c3960efa1c
React-RCTNetwork: 2e91efa49b63e54a9782922e5ca1d09ff2789341
React-RCTSettings: fd13eebaa3f9af0b56a0ecb053b108e160fbfe07
React-RCTText: 4cd7c87db1e1da51a96b86ce39c5468c1dbaae60
React-RCTVibration: 579f64ceb06701eca3004a500169e1152c1ef7d2
React-rendererconsistency: 5ef1c4642fd6365bf6d5d4e29a3ae02c3a1b8980
React-rendererdebug: 7f6a24cbb5008a22ccb34a0d031a259b006facf6
React-rendererdebug: 8952e1ad914c680d4978916a9eed7c6dc85301d7
React-rncore: 0e5394ce20a9d2bf12409d14395588c7b9e6e9ce
React-RuntimeApple: bbe293f233d17304c9597309acde7505080fd53d
React-RuntimeCore: 5a1cbfc3e7af4fbdea2b9b1efd39cd51a4d4006f
React-RuntimeApple: f5ed38fba1230713313e88e750dcad06948ba625
React-RuntimeCore: 0fc488daf136f05d96349772828ccf64f66d6d2a
React-runtimeexecutor: ffac5f09795a5e881477e0d72a0fa6385456bed3
React-RuntimeHermes: 0a1fd1c150faed8341887dd89895eeb8d4d2d3c5
React-runtimescheduler: e7df538274de0c65736068e40efc0d2228f42d0d
React-RuntimeHermes: b8f395d41116c3bdf3373e87c39a856f69c3fff8
React-runtimescheduler: 933c72afd4f285b2bb473c0de2482ee250f3e735
React-timing: b3b233fe819d9e5b6ca32b605aa732621bdfa5aa
React-utils: 5362bd16a9563f9916e7a56c011ddc533507650f
ReactCodegen: 865bafc5c17ec2181620ced1a32c39c38ab2951d
ReactCommon: 422e364463f33e336fc4db196aeb50fd801d90d6
React-utils: 0c825829a8e2ca39bb049d95f270a2dbf39ecb05
ReactCodegen: 3b0ff1c9015e3ebcf2bd2f8559995c74bfacf8a1
ReactCommon: c21a3d6a8d3e98b6e99730139a52f59f0beea89d
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
uniffi-bindgen-react-native: caa3b0ec0a5c904fbc334fc63144146079ce3934
unomed-react-native-matrix-sdk: 355459cab93fc56ec27a05a036362ea16513ddc3
uniffi-bindgen-react-native: 94187f3210e69fdff0be200fdf3491a79327b895
unomed-react-native-matrix-sdk: 4f53a6a5585ea27282c7a5f10e5e0459a2d36ff0
Yoga: db69236006b8b1c6d55ab453390c882306cbf219

PODFILE CHECKSUM: 49b187f74553462550d36ec0be911b8ed042c199
PODFILE CHECKSUM: da0c87f66ad14d6dd51ef033b7ed4390032c6bd4

COCOAPODS: 1.16.2
COCOAPODS: 1.15.2
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,6 @@
CXX = "";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = x86_64;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -636,7 +635,6 @@
CXX = "";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = x86_64;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down
1 change: 1 addition & 0 deletions ubrn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ios:
targets:
- aarch64-apple-ios
- aarch64-apple-ios-sim
- x86_64-apple-ios
xcodebuildExtras: []
frameworkName: build/RnMatrixRustSdk
noOverwrite: []
Expand Down

0 comments on commit de9e0d2

Please sign in to comment.