Skip to content

Commit

Permalink
chore: update dependencies, handle Apple's XCode/Swift bug (#589)
Browse files Browse the repository at this point in the history
  • Loading branch information
boorad authored Jan 22, 2025
1 parent 7e764b2 commit 4e36481
Show file tree
Hide file tree
Showing 37 changed files with 79 additions and 57 deletions.
Binary file modified bun.lockb
Binary file not shown.
18 changes: 9 additions & 9 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PODS:
- hermes-engine (0.76.1):
- hermes-engine/Pre-built (= 0.76.1)
- hermes-engine/Pre-built (0.76.1)
- NitroModules (0.18.2):
- NitroModules (0.21.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1310,7 +1310,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-safe-area-context (4.14.0):
- react-native-safe-area-context (5.1.0):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1323,8 +1323,8 @@ PODS:
- React-featureflags
- React-graphics
- React-ImageManager
- react-native-safe-area-context/common (= 4.14.0)
- react-native-safe-area-context/fabric (= 4.14.0)
- react-native-safe-area-context/common (= 5.1.0)
- react-native-safe-area-context/fabric (= 5.1.0)
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
Expand All @@ -1333,7 +1333,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-safe-area-context/common (4.14.0):
- react-native-safe-area-context/common (5.1.0):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1354,7 +1354,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-safe-area-context/fabric (4.14.0):
- react-native-safe-area-context/fabric (5.1.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1938,9 +1938,9 @@ SPEC CHECKSUMS:
fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
hermes-engine: 46f1ffbf0297f4298862068dd4c274d4ac17a1fd
NitroModules: 47399393665e69228b29a17f501c7b453679ccc0
NitroModules: c36d6f656038a56beb1b1bcab2d0252d71744013
OpenSSL-Universal: b60a3702c9fea8b3145549d421fdb018e53ab7b4
QuickCrypto: 0b8c8760ad1da6b41758fbc844136c68958f04b6
QuickCrypto: d0701f3b969cd67bb5034bd7ae644110e619ba29
RCT-Folly: 84578c8756030547307e4572ab1947de1685c599
RCTDeprecation: fde92935b3caa6cb65cbff9fbb7d3a9867ffb259
RCTRequired: 75c6cee42d21c1530a6f204ba32ff57335d19007
Expand Down Expand Up @@ -1971,7 +1971,7 @@ SPEC CHECKSUMS:
React-Mapbuffer: 0d88ad9afa9e195dd7634424bde1d38e4129e646
React-microtasksnativemodule: 17234f35d37e6ed388e18a6314210b3b9e051219
react-native-quick-base64: 580797392fd44fab9721fcb3d6f3fc4e40bf7351
react-native-safe-area-context: 819935871d06a80e963546208027f839aa972a85
react-native-safe-area-context: 0d8827b2420dfb4c8a8e27639585e61b912261be
React-nativeconfig: 93fe8c85a8c40820c57814e30f3e44b94c995a7b
React-NativeModulesApple: a4457b73e63e983db66d66612160006bccb00ad5
React-perflogger: 3140b7778984a486db80d4d2aeaa266cae4eb8c7
Expand Down
8 changes: 4 additions & 4 deletions example/ios/QuickCryptoExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
CURRENT_PROJECT_VERSION = 1;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = QuickCryptoExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -319,7 +319,7 @@
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
INFOPLIST_FILE = QuickCryptoExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -388,7 +388,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD = "";
LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -462,7 +462,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD = "";
LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
6 changes: 3 additions & 3 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
"react": "18.3.1",
"react-native": "0.76.1",
"react-native-bouncy-checkbox": "4.0.1",
"react-native-nitro-modules": "0.18.2",
"react-native-nitro-modules": "0.21.0",
"react-native-quick-base64": "2.1.2",
"react-native-quick-crypto": "1.0.0-beta.9",
"react-native-safe-area-context": "4.14.0",
"react-native-safe-area-context": "5.1.0",
"react-native-screens": "3.35.0",
"react-native-vector-icons": "^10.1.0",
"readable-stream": "4.5.2",
"tinybench": "^3.0.6",
"util": "0.12.5"
},
"devDependencies": {
"@babel/core": "7.25.2",
"@babel/core": "7.26.0",
"@babel/plugin-transform-class-static-block": "7.26.0",
"@babel/preset-env": "7.26.0",
"@babel/runtime": "7.25.0",
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,8 @@
"workspaces": [
"packages/react-native-quick-crypto",
"example"
]
],
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
}
}
4 changes: 2 additions & 2 deletions packages/react-native-quick-crypto/QuickCrypto.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.license = package["license"]
s.authors = package["authors"]

s.ios.deployment_target = min_ios_version_supported
s.ios.deployment_target = 16.0 # min_ios_version_supported (see https://github.com/Expensify/App/pull/53149#issuecomment-2562786065)
s.visionos.deployment_target = 1.0
s.macos.deployment_target = 10.13
s.tvos.deployment_target = 13.4
Expand All @@ -37,7 +37,7 @@ Pod::Spec.new do |s|
add_dependency(s, "React-jsinspector", :framework_name => "jsinspector_modern")
add_dependency(s, "React-rendererconsistency", :framework_name => "React_rendererconsistency")
end

# Add all files generated by Nitrogen
load 'nitrogen/generated/ios/QuickCrypto+autolinking.rb'
add_nitrogen_files(s)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# QuickCrypto+autolinking.cmake
# This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
# https://github.com/mrousavy/nitro
# Copyright © 2024 Marc Rousavy @ Margelo
# Copyright © 2025 Marc Rousavy @ Margelo
#

# This is a CMake file that adds all files generated by Nitrogen
Expand Down Expand Up @@ -35,6 +35,9 @@ target_sources(

)

# Define a flag to check if we are building properly
add_definitions(-DBUILDING_QUICKCRYPTO_WITH_GENERATED_CMAKE_PROJECT)

# Add all libraries required by the generated specs
find_package(fbjni REQUIRED) # <-- Used for communication between Java <-> C++
find_package(ReactAndroid REQUIRED) # <-- Used to set up React Native bindings (e.g. CallInvoker/TurboModule)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// QuickCrypto+autolinking.gradle
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

/// This is a Gradle file that adds all files generated by Nitrogen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
/// QuickCryptoOnLoad.cpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#ifndef BUILDING_QUICKCRYPTO_WITH_GENERATED_CMAKE_PROJECT
#error QuickCryptoOnLoad.cpp is not being built with the autogenerated CMakeLists.txt project. Is a different CMakeLists.txt building this?
#endif

#include "QuickCryptoOnLoad.hpp"

#include <jni.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// QuickCryptoOnLoad.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#include <jni.h>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# QuickCrypto+autolinking.rb
# This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
# https://github.com/mrousavy/nitro
# Copyright © 2024 Marc Rousavy @ Margelo
# Copyright © 2025 Marc Rousavy @ Margelo
#

# This is a Ruby script that adds all files generated by Nitrogen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// QuickCrypto-Swift-Cxx-Bridge.cpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#include "QuickCrypto-Swift-Cxx-Bridge.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// QuickCrypto-Swift-Cxx-Bridge.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// QuickCrypto-Swift-Cxx-Umbrella.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// QuickCryptoAutolinking.mm
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#import <Foundation/Foundation.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// QuickCryptoAutolinking.swift
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

public final class QuickCryptoAutolinking {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// CFRGKeyPairType.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridEdKeyPairSpec.cpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#include "HybridEdKeyPairSpec.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridEdKeyPairSpec.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridKeyObjectHandleSpec.cpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#include "HybridKeyObjectHandleSpec.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridKeyObjectHandleSpec.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridPbkdf2Spec.cpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#include "HybridPbkdf2Spec.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridPbkdf2Spec.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridRandomSpec.cpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#include "HybridRandomSpec.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// HybridRandomSpec.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// JWK.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// JWKkty.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// JWKuse.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// KFormatType.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down Expand Up @@ -47,7 +47,7 @@ namespace margelo::nitro {
int enumValue = static_cast<int>(arg);
return JSIConverter<int>::toJSI(runtime, enumValue);
}
static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
if (!value.isNumber()) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// KeyDetail.hpp
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
/// https://github.com/mrousavy/nitro
/// Copyright © 2024 Marc Rousavy @ Margelo
/// Copyright © 2025 Marc Rousavy @ Margelo
///

#pragma once
Expand Down
Loading

0 comments on commit 4e36481

Please sign in to comment.