diff --git a/android/app/build.gradle b/android/app/build.gradle index 336ca720..26dd34dd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "id.credebl.adeya" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 16 - versionName "1.0.10" + versionCode 17 + versionName "1.0.11" missingDimensionStrategy 'react-native-camera', 'general' } diff --git a/app/screens/CredentialDetailsW3C.tsx b/app/screens/CredentialDetailsW3C.tsx index d4c3d6a2..857a42ba 100644 --- a/app/screens/CredentialDetailsW3C.tsx +++ b/app/screens/CredentialDetailsW3C.tsx @@ -367,6 +367,7 @@ const CredentialDetailsW3C: React.FC = ({ navigation, ro const options: RNHTMLtoPDF.Options = { html: content, fileName: w3cCredential?.credential.type[1], + padding: 0, directory: 'Documents', // add height and width to the options of a4 paper size ...getA4Sizes(prettyVc.orientation), diff --git a/ios/AdeyaWallet.xcodeproj/project.pbxproj b/ios/AdeyaWallet.xcodeproj/project.pbxproj index 404eaa8d..c8a06763 100644 --- a/ios/AdeyaWallet.xcodeproj/project.pbxproj +++ b/ios/AdeyaWallet.xcodeproj/project.pbxproj @@ -507,17 +507,18 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AdeyaWallet/AdeyaWallet.entitlements; - CURRENT_PROJECT_VERSION = 47; + CURRENT_PROJECT_VERSION = 48; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = Z5W7KRPGHZ; ENABLE_BITCODE = NO; INFOPLIST_FILE = AdeyaWallet/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "ADEYA Wallet"; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.10; + MARKETING_VERSION = 1.0.11; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -545,16 +546,17 @@ CODE_SIGN_ENTITLEMENTS = AdeyaWallet/AdeyaWallet.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 47; + CURRENT_PROJECT_VERSION = 48; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = Z5W7KRPGHZ; INFOPLIST_FILE = AdeyaWallet/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "ADEYA Wallet"; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.10; + MARKETING_VERSION = 1.0.11; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/Podfile b/ios/Podfile index 5db926f0..ceb9f033 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -10,7 +10,7 @@ end node_require('react-native/scripts/react_native_pods.rb') node_require('react-native-permissions/scripts/setup.rb') -platform :ios, min_ios_version_supported +platform :ios, '15.5' prepare_react_native_project! setup_permissions([ @@ -71,6 +71,27 @@ target 'AdeyaWallet' do config.build_settings['CODE_SIGNING_ALLOWED'] = "NO" end end + + bitcode_strip_path = `xcrun --find bitcode_strip`.chop! + def strip_bitcode_from_framework(bitcode_strip_path, framework_relative_path) + framework_path = File.join(Dir.pwd, framework_relative_path) + command = "#{bitcode_strip_path} #{framework_path} -r -o #{framework_path}" + puts "Stripping bitcode: #{command}" + system(command) + end + + framework_paths = [ + "Pods/LogRocket/LogRocket.xcframework/ios-arm64/LogRocket.framework/LogRocket", + "Pods/hermes-engine/destroot/Library/Frameworks/macosx/hermes.framework/hermes", + "Pods/hermes-engine/destroot/Library/Frameworks/macosx/hermes.framework/Versions/Current/hermes", + "Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework/ios-arm64/hermes.framework/hermes", + "Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework/ios-arm64_x86_64-maccatalyst/hermes.framework/hermes" + ] + + framework_paths.each do |framework_relative_path| + strip_bitcode_from_framework(bitcode_strip_path, framework_relative_path) + end + # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202 react_native_post_install( installer, diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6c52928c..4842dcf0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -684,15 +684,15 @@ PODS: - React-Core - RNVectorIcons (10.0.0): - React-Core - - RNZipArchive (6.1.2): + - RNZipArchive (7.0.1): - React-Core - - RNZipArchive/Core (= 6.1.2) - - SSZipArchive (~> 2.2) - - RNZipArchive/Core (6.1.2): + - RNZipArchive/Core (= 7.0.1) + - SSZipArchive (~> 2.5.5) + - RNZipArchive/Core (7.0.1): - React-Core - - SSZipArchive (~> 2.2) + - SSZipArchive (~> 2.5.5) - SocketRocket (0.6.1) - - SSZipArchive (2.4.3) + - SSZipArchive (2.5.5) - Yoga (1.14.0) DEPENDENCIES: @@ -1050,11 +1050,11 @@ SPEC CHECKSUMS: RNShare: bed7c4fbe615f3d977f22feb0902af9a790c1660 RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9 RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9 - RNZipArchive: 6d736ee4e286dbbd9d81206b7a4da355596ca04a + RNZipArchive: 7bb4c70d6aa2dd235212c0a4a3de0a4e237e2569 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef + SSZipArchive: c69881e8ac5521f0e622291387add5f60f30f3c4 Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce -PODFILE CHECKSUM: c4f2b64f733d5092ed97bf9c8913baae9338ea31 +PODFILE CHECKSUM: 917f70721de439f934fcbed8c677d33ee4d8a63c COCOAPODS: 1.15.2 diff --git a/package.json b/package.json index 7782afec..6eb4658a 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "react-native-toast-message": "^2.1.6", "react-native-vector-icons": "^10.0.0", "react-native-webview": "^13.3.1", - "react-native-zip-archive": "^6.1.2", + "react-native-zip-archive": "^7.0.1", "readable-stream": "1.0.33", "stream-browserify": "^1.0.0", "unique-names-generator": "^4.7.1", diff --git a/yarn.lock b/yarn.lock index a326ae36..e115a439 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10158,10 +10158,10 @@ react-native-webview@^13.3.1: escape-string-regexp "2.0.0" invariant "2.2.4" -react-native-zip-archive@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/react-native-zip-archive/-/react-native-zip-archive-6.1.2.tgz#6febcf2ac1b30ef1ed85c88ed29849571c1ba8c8" - integrity sha512-LcJomSY/6O3KHy/LF6Gb7F/yRJiZJ0lTlPQPbfeOHBQzfvqNJFJZ8x6HrdeYeokFf/UGB5bY7jfh4es6Y/PhBA== +react-native-zip-archive@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/react-native-zip-archive/-/react-native-zip-archive-7.0.1.tgz#d682a208de72da6d3609d7a3a60d65465dfc6f83" + integrity sha512-Zd3TDVCUQkAC3jjvmFjjJHOoig+ryYcOMrh7iLiwQCqe8TgrGJm3rhDNDgpfHKdLRMlIletvz2sh9OOttb0dZQ== react-native@0.72.3: version "0.72.3"