From d79636815b54d78cfde33b1a4869434ba2c8cfbd Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Fri, 20 Dec 2024 08:47:52 +0100 Subject: [PATCH] chore: update ubrn to 0.28.3-1 --- example/ios/Podfile | 3 - example/ios/Podfile.lock | 101 ++++++++++++------------- package.json | 2 +- src/generated/matrix_sdk.ts | 7 +- src/generated/matrix_sdk_base.ts | 7 +- src/generated/matrix_sdk_common.ts | 7 +- src/generated/matrix_sdk_crypto.ts | 7 +- src/generated/matrix_sdk_ffi.ts | 7 +- src/generated/matrix_sdk_ui.ts | 7 +- unomed-react-native-matrix-sdk.podspec | 3 +- yarn.lock | 14 ++-- 11 files changed, 96 insertions(+), 69 deletions(-) diff --git a/example/ios/Podfile b/example/ios/Podfile index 9f65e74..23735df 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -25,9 +25,6 @@ target 'ReactNativeMatrixSdkExample' do :app_path => "#{Pod::Config.instance.installation_root}/.." ) - # TODO: Remove once the pod has been published - pod 'uniffi-bindgen-react-native', :path => '../../node_modules/uniffi-bindgen-react-native' - target 'ReactNativeMatrixSdkExampleTests' do inherit! :complete # Pods for testing diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f7afe27..bf15fcc 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1510,8 +1510,8 @@ PODS: - React-perflogger (= 0.76.1) - React-utils (= 0.76.1) - SocketRocket (0.7.1) - - uniffi-bindgen-react-native (0.28.2-0): - - React + - uniffi-bindgen-react-native (0.28.3-1): + - React-Core - unomed-react-native-matrix-sdk (0.3.0): - DoubleConversion - glog @@ -1532,6 +1532,7 @@ PODS: - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core + - uniffi-bindgen-react-native (= 0.28.3-1) - Yoga - Yoga (0.0.0) @@ -1600,13 +1601,13 @@ DEPENDENCIES: - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCodegen (from `build/generated/ios`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - uniffi-bindgen-react-native (from `../../node_modules/uniffi-bindgen-react-native`) - unomed-react-native-matrix-sdk (from `../..`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: trunk: - SocketRocket + - uniffi-bindgen-react-native EXTERNAL SOURCES: boost: @@ -1734,8 +1735,6 @@ EXTERNAL SOURCES: :path: build/generated/ios ReactCommon: :path: "../node_modules/react-native/ReactCommon" - uniffi-bindgen-react-native: - :path: "../../node_modules/uniffi-bindgen-react-native" unomed-react-native-matrix-sdk: :path: "../.." Yoga: @@ -1754,61 +1753,61 @@ SPEC CHECKSUMS: RCTTypeSafety: 7e6fe47bfb693c50d4669db1a480ca5331795f5b React: 8e73704cdd5c7f801936776d2fc434c605a7827b React-callinvoker: fa27d1e091e683de88f576e6a5d4efc171929a4c - React-Core: 948deed7fa720eeb0d901ff9e45c3719767dab5f - React-CoreModules: a11ba75f64245d12a0869203664a802c11594c43 - React-cxxreact: a5ce05f8a0a1398958523f948fce00d4c8ce38ff + React-Core: 8dd14bffcc9b877091b698e45701160669a31f91 + React-CoreModules: b4437acf2ef25ce3689c84df661dc5d806559b35 + React-cxxreact: 6125cd820da7e18f9ca8343b3c42ee61634a4e0d React-debug: f474f5c202a277f76c81bf7cf26284f2c09880d7 - React-defaultsnativemodule: 41cc9a60277f1bec4b258df324e28705ac00b91a - React-domnativemodule: 4fe895d9e4aa99590700c5a5f9ff5706e9481ed7 - React-Fabric: bbdcc01a98528846efacf0767567a8e76df794bb - React-FabricComponents: ab8967c5898d88f37486df0eb0111384c498d821 - React-FabricImage: 7a06db59488b37f509dee73fa0b2811608a67058 + React-defaultsnativemodule: 7141fa704531cbf7a7e7af3bc02adfa367e831a7 + React-domnativemodule: c1806b8584a53ed912012a4d8b2c6f96a84c77a3 + React-Fabric: ba9636cfc7f9b77df6cb7edb2c70d0237026404b + React-FabricComponents: c408da05a4ea5ba071732245b4a7f48f904e610a + React-FabricImage: c409858f319f11709b49ffa6c5bca4faf794cb44 React-featureflags: 929732439d139ac0662e08f009f1a51ed2b91ed3 - 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-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-nativeconfig: 93fe8c85a8c40820c57814e30f3e44b94c995a7b - React-NativeModulesApple: a4457b73e63e983db66d66612160006bccb00ad5 - React-perflogger: 3140b7778984a486db80d4d2aeaa266cae4eb8c7 - React-performancetimeline: 41c100bc1299d7b150821b99cf26661c51ed9ab0 + React-NativeModulesApple: b3e076fd0d7b73417fe1e8c8b26e3c57ae9b74aa + React-perflogger: 1c55bcd3c392137cbaf0d21d8bb87ce9a0cebb15 + React-performancetimeline: e89249db10b8f7bf8f72c2e9bd471ac37d48b753 React-RCTActionSheet: 9407c795fbeee35da2dae3cd6b5c4e5da6ff8bd3 - 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-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-rendererconsistency: 5ef1c4642fd6365bf6d5d4e29a3ae02c3a1b8980 - React-rendererdebug: 8952e1ad914c680d4978916a9eed7c6dc85301d7 + React-rendererdebug: 7f6a24cbb5008a22ccb34a0d031a259b006facf6 React-rncore: 0e5394ce20a9d2bf12409d14395588c7b9e6e9ce - React-RuntimeApple: f5ed38fba1230713313e88e750dcad06948ba625 - React-RuntimeCore: 0fc488daf136f05d96349772828ccf64f66d6d2a + React-RuntimeApple: bbe293f233d17304c9597309acde7505080fd53d + React-RuntimeCore: 5a1cbfc3e7af4fbdea2b9b1efd39cd51a4d4006f React-runtimeexecutor: ffac5f09795a5e881477e0d72a0fa6385456bed3 - React-RuntimeHermes: b8f395d41116c3bdf3373e87c39a856f69c3fff8 - React-runtimescheduler: 933c72afd4f285b2bb473c0de2482ee250f3e735 + React-RuntimeHermes: 0a1fd1c150faed8341887dd89895eeb8d4d2d3c5 + React-runtimescheduler: e7df538274de0c65736068e40efc0d2228f42d0d React-timing: b3b233fe819d9e5b6ca32b605aa732621bdfa5aa - React-utils: 0c825829a8e2ca39bb049d95f270a2dbf39ecb05 - ReactCodegen: 3b0ff1c9015e3ebcf2bd2f8559995c74bfacf8a1 - ReactCommon: c21a3d6a8d3e98b6e99730139a52f59f0beea89d + React-utils: 5362bd16a9563f9916e7a56c011ddc533507650f + ReactCodegen: 865bafc5c17ec2181620ced1a32c39c38ab2951d + ReactCommon: 422e364463f33e336fc4db196aeb50fd801d90d6 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 - uniffi-bindgen-react-native: 94187f3210e69fdff0be200fdf3491a79327b895 - unomed-react-native-matrix-sdk: 4f53a6a5585ea27282c7a5f10e5e0459a2d36ff0 + uniffi-bindgen-react-native: 29959d30509f56394fca1cbce568000ab0de8642 + unomed-react-native-matrix-sdk: bb06ecb9acb6a29b2d7887acf50e7db6d92f3eb9 Yoga: db69236006b8b1c6d55ab453390c882306cbf219 -PODFILE CHECKSUM: da0c87f66ad14d6dd51ef033b7ed4390032c6bd4 +PODFILE CHECKSUM: 26c75fa7a8774e3435310ec3d6056a0c49f27cc8 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/package.json b/package.json index 2c58e0f..f42dbcc 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "release-it": "^15.0.0", "turbo": "^1.10.7", "typescript": "^5.2.2", - "uniffi-bindgen-react-native": "https://github.com/jhugman/uniffi-bindgen-react-native#c6f21855628db57719cb31fb0a4c5316a6d0c9b7" + "uniffi-bindgen-react-native": "0.28.3-1" }, "resolutions": { "@types/react": "^18.2.44" diff --git a/src/generated/matrix_sdk.ts b/src/generated/matrix_sdk.ts index ea9dd53..6c09b30 100644 --- a/src/generated/matrix_sdk.ts +++ b/src/generated/matrix_sdk.ts @@ -58,7 +58,12 @@ import { // Get converters from the other files, if any. -const uniffiIsDebug = process.env.uniffiIsDebug !== 'production' || false; +const uniffiIsDebug = + // @ts-ignore -- The process global might not be defined + typeof process !== 'object' || + // @ts-ignore -- The process global might not be defined + process?.env?.NODE_ENV !== 'production' || + false; // Public interface members begin here. /** diff --git a/src/generated/matrix_sdk_base.ts b/src/generated/matrix_sdk_base.ts index 008034a..54435e3 100644 --- a/src/generated/matrix_sdk_base.ts +++ b/src/generated/matrix_sdk_base.ts @@ -42,7 +42,12 @@ import { // Get converters from the other files, if any. -const uniffiIsDebug = process.env.uniffiIsDebug !== 'production' || false; +const uniffiIsDebug = + // @ts-ignore -- The process global might not be defined + typeof process !== 'object' || + // @ts-ignore -- The process global might not be defined + process?.env?.NODE_ENV !== 'production' || + false; // Public interface members begin here. const stringToArrayBuffer = (s: string): ArrayBuffer => diff --git a/src/generated/matrix_sdk_common.ts b/src/generated/matrix_sdk_common.ts index 8e14acf..5b3d674 100644 --- a/src/generated/matrix_sdk_common.ts +++ b/src/generated/matrix_sdk_common.ts @@ -43,7 +43,12 @@ import { // Get converters from the other files, if any. -const uniffiIsDebug = process.env.uniffiIsDebug !== 'production' || false; +const uniffiIsDebug = + // @ts-ignore -- The process global might not be defined + typeof process !== 'object' || + // @ts-ignore -- The process global might not be defined + process?.env?.NODE_ENV !== 'production' || + false; // Public interface members begin here. const stringToArrayBuffer = (s: string): ArrayBuffer => diff --git a/src/generated/matrix_sdk_crypto.ts b/src/generated/matrix_sdk_crypto.ts index 6d4fc46..a98981e 100644 --- a/src/generated/matrix_sdk_crypto.ts +++ b/src/generated/matrix_sdk_crypto.ts @@ -49,7 +49,12 @@ import { // Get converters from the other files, if any. -const uniffiIsDebug = process.env.uniffiIsDebug !== 'production' || false; +const uniffiIsDebug = + // @ts-ignore -- The process global might not be defined + typeof process !== 'object' || + // @ts-ignore -- The process global might not be defined + process?.env?.NODE_ENV !== 'production' || + false; // Public interface members begin here. /** diff --git a/src/generated/matrix_sdk_ffi.ts b/src/generated/matrix_sdk_ffi.ts index 506fa2e..745de87 100644 --- a/src/generated/matrix_sdk_ffi.ts +++ b/src/generated/matrix_sdk_ffi.ts @@ -144,7 +144,12 @@ const { FfiConverterTypeRoomPinnedEventsChange, } = uniffiMatrixSdkUiModule.converters; -const uniffiIsDebug = process.env.uniffiIsDebug !== 'production' || false; +const uniffiIsDebug = + // @ts-ignore -- The process global might not be defined + typeof process !== 'object' || + // @ts-ignore -- The process global might not be defined + process?.env?.NODE_ENV !== 'production' || + false; // Public interface members begin here. /** diff --git a/src/generated/matrix_sdk_ui.ts b/src/generated/matrix_sdk_ui.ts index a4238b7..8416eb3 100644 --- a/src/generated/matrix_sdk_ui.ts +++ b/src/generated/matrix_sdk_ui.ts @@ -46,7 +46,12 @@ import { // Get converters from the other files, if any. -const uniffiIsDebug = process.env.uniffiIsDebug !== 'production' || false; +const uniffiIsDebug = + // @ts-ignore -- The process global might not be defined + typeof process !== 'object' || + // @ts-ignore -- The process global might not be defined + process?.env?.NODE_ENV !== 'production' || + false; // Public interface members begin here. const stringToArrayBuffer = (s: string): ArrayBuffer => diff --git a/unomed-react-native-matrix-sdk.podspec b/unomed-react-native-matrix-sdk.podspec index c56d43e..92a2b89 100644 --- a/unomed-react-native-matrix-sdk.podspec +++ b/unomed-react-native-matrix-sdk.podspec @@ -15,8 +15,9 @@ Pod::Spec.new do |s| s.platforms = { :ios => min_ios_version_supported } s.source = { :git => "https://github.com/unomed-dev/react-native-matrix-sdk.git", :tag => "#{s.version}" } - s.source_files = "ios/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}", "cpp/generated/**/*.{hpp,cpp,c,h}" + s.source_files = "ios/**/*.{h,m,mm}", "ios/generated/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}", "cpp/generated/**/*.{hpp,cpp,c,h}" s.vendored_frameworks = "build/RnMatrixRustSdk.xcframework" + s.dependency "uniffi-bindgen-react-native", "0.28.3-1" # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0. # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79. diff --git a/yarn.lock b/yarn.lock index fddbd74..8d36c6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4482,7 +4482,7 @@ __metadata: release-it: ^15.0.0 turbo: ^1.10.7 typescript: ^5.2.2 - uniffi-bindgen-react-native: "https://github.com/jhugman/uniffi-bindgen-react-native#c6f21855628db57719cb31fb0a4c5316a6d0c9b7" + uniffi-bindgen-react-native: 0.28.3-1 peerDependencies: react: "*" react-native: "*" @@ -14066,13 +14066,13 @@ __metadata: languageName: node linkType: hard -"uniffi-bindgen-react-native@https://github.com/jhugman/uniffi-bindgen-react-native#c6f21855628db57719cb31fb0a4c5316a6d0c9b7": - version: 0.28.2-0 - resolution: "uniffi-bindgen-react-native@https://github.com/jhugman/uniffi-bindgen-react-native.git#commit=c6f21855628db57719cb31fb0a4c5316a6d0c9b7" +"uniffi-bindgen-react-native@npm:0.28.3-1": + version: 0.28.3-1 + resolution: "uniffi-bindgen-react-native@npm:0.28.3-1" bin: - ubrn: ./bin/cli.cjs - uniffi-bindgen-react-native: ./bin/cli.cjs - checksum: 2be2625507e7db7324adcbff3cf00feb6e7456191259b9a589f3ebcf12bc0bdabf9fa2b8ecb20a64021495daf7e0c6cd8ddd98d61b2efec27ed32d6c7f97fcb9 + ubrn: bin/cli.cjs + uniffi-bindgen-react-native: bin/cli.cjs + checksum: ce2dce1b65af02aa5c83be32d63d9a2dc6f05fcc09ba36c04da85cfb4742a5b1d5040013452c27b6b6c5ec9416657dafe2bab76daf6b8ef42250c5d51e648ad1 languageName: node linkType: hard