Skip to content

Commit

Permalink
Merge pull request #5557 from bithyve/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
cakesoft-shashank authored Nov 10, 2024
2 parents 45ec2b4 + fcc003b commit 6aef053
Show file tree
Hide file tree
Showing 325 changed files with 9,672 additions and 6,867 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ env*
!.env.example

# testing
/coverage
modules/
9 changes: 7 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ android {
applicationId "io.hexawallet.keeper"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 405
versionName "1.2.17"
versionCode 413
versionName "1.2.18"
missingDimensionStrategy 'react-native-camera', 'general'
missingDimensionStrategy 'store', 'play'
multiDexEnabled true
Expand Down Expand Up @@ -155,6 +155,11 @@ android {
}
}


repositories{
mavenLocal()
}

dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
Expand Down
10 changes: 10 additions & 0 deletions android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application
android:usesCleartextTraffic="true"
android:requestLegacyExternalStorage="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
Expand All @@ -53,6 +54,15 @@
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>

<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
<data android:host="bitcoinkeeper.app" />
<data android:pathPrefix="/app/dev" />
</intent-filter>

<meta-data
android:name="android.nfc.cardemulation.host_apdu_service"
android:resource="@xml/apduservice" />
Expand Down
2 changes: 2 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
android:allowBackup="false"
android:usesCleartextTraffic="true"
android:networkSecurityConfig="@xml/network_security_config"
android:requestLegacyExternalStorage="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
Expand Down Expand Up @@ -63,6 +64,7 @@
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
<data android:host="bitcoinkeeper.app" />
<data android:pathPrefix="/app/prod" />
</intent-filter>
</activity>
<meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
Expand Down
1 change: 1 addition & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ buildscript {
repositories {
google()
mavenCentral()
mavenLocal()
}
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
Expand Down
11 changes: 10 additions & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require Pod::Executable.execute_command('node', ['-p',
{paths: [process.argv[1]]},
)', __dir__]).strip

platform :ios, min_ios_version_supported
platform :ios, 13.0
prepare_react_native_project!
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
Expand All @@ -25,6 +25,7 @@ def common_pods
use_frameworks! :linkage => linkage.to_sym
end
config = use_native_modules!
pod 'libportal-ios', :git => 'https://github.com/bithyve/libportal-ios.git'
pod 'PDFGenerator'
pod 'QRCoder'
# Flags change depending on the env values.
Expand Down Expand Up @@ -54,6 +55,14 @@ target 'hexa_keeper_dev' do
end

post_install do |installer|

# Set deployment target to 13.0 for all targets
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
end
end

# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
config = use_native_modules!
react_native_post_install(
Expand Down
23 changes: 20 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ PODS:
- hermes-engine/Pre-built (= 0.72.4)
- hermes-engine/Pre-built (0.72.4)
- libevent (2.1.12)
- libportal-ios (0.3.0)
- libportal-react-native (0.3.0):
- libportal-ios
- React-Core
- MMKV (1.3.5):
- MMKVCore (~> 1.3.5)
- MMKVCore (1.3.5)
Expand Down Expand Up @@ -419,7 +423,7 @@ PODS:
- react-native-mmkv (2.11.0):
- MMKV (>= 1.2.13)
- React-Core
- react-native-nfc-manager (3.14.7):
- react-native-nfc-manager (3.16.0):
- React-Core
- react-native-pdf (6.7.1):
- React-Core
Expand Down Expand Up @@ -626,6 +630,8 @@ DEPENDENCIES:
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
- libevent (~> 2.1.12)
- libportal-ios (from `https://github.com/bithyve/libportal-ios.git`)
- libportal-react-native (from `../node_modules/libportal-react-native`)
- PDFGenerator
- QrCode (from `../node_modules/react-native-qr-decode-image-camera`)
- QRCoder
Expand Down Expand Up @@ -745,6 +751,10 @@ EXTERNAL SOURCES:
hermes-engine:
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
:tag: hermes-2023-08-07-RNv0.72.4-813b2def12bc9df02654b3e3653ae4a68d0572e0
libportal-ios:
:git: https://github.com/bithyve/libportal-ios.git
libportal-react-native:
:path: "../node_modules/libportal-react-native"
QrCode:
:path: "../node_modules/react-native-qr-decode-image-camera"
RCT-Folly:
Expand Down Expand Up @@ -882,6 +892,11 @@ EXTERNAL SOURCES:
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"

CHECKOUT OPTIONS:
libportal-ios:
:commit: 01a465760f56fca19473c83553707067f82995dc
:git: https://github.com/bithyve/libportal-ios.git

SPEC CHECKSUMS:
boost: 57d2868c099736d80fcd648bf211b4431e51a558
BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
Expand All @@ -900,6 +915,8 @@ SPEC CHECKSUMS:
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
hermes-engine: 81191603c4eaa01f5e4ae5737a9efcf64756c7b2
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libportal-ios: d9aa55474e2d5be8e38e96345dd37be34fda45b4
libportal-react-native: 33497db38793824d5e5d13210aa1879b012c7718
MMKV: 506311d0494023c2f7e0b62cc1f31b7370fa3cfb
MMKVCore: 9e2e5fd529b64a9fe15f1a7afb3d73b2e27b4db9
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
Expand Down Expand Up @@ -933,7 +950,7 @@ SPEC CHECKSUMS:
react-native-html-to-pdf: 4c5c6e26819fe202971061594058877aa9b25265
react-native-image-picker: 60f4246eb5bb7187fc15638a8c1f13abd3820695
react-native-mmkv: e97c0c79403fb94577e5d902ab1ebd42b0715b43
react-native-nfc-manager: ca60627c7b9270019b9442d86f9e20fe9cb2ee28
react-native-nfc-manager: 1bcdf6f96c9065a8f4c8d9a0c6fb2db625205b2c
react-native-pdf: 7c0e91ada997bac8bac3bb5bea5b6b81f5a3caae
react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
Expand Down Expand Up @@ -987,6 +1004,6 @@ SPEC CHECKSUMS:
ZendeskSDKStorage: 00d6f78a39a42b71c3730b1c39cc0a5c12690685
ZendeskSDKUIComponents: 59fab9ac52f3ac5ef3136188da8dc38b06d100f7

PODFILE CHECKSUM: b80fbe055eecdd5724e90f6e5ced79eb74133804
PODFILE CHECKSUM: a4c7b760460d07fb6239ffdc46fb20e0afda1e7a

COCOAPODS: 1.15.2
Loading

0 comments on commit 6aef053

Please sign in to comment.