diff --git a/android/app/build.gradle b/android/app/build.gradle index 9e8e1bdafd..492ba59af4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -69,7 +69,7 @@ def enableSeparateBuildPerCPUArchitecture = true /** * Set this to true to Run Proguard on Release builds to minify the Java bytecode. */ -def enableProguardInReleaseBuilds = false +def enableProguardInBuilds = true /** * The preferred build flavor of JavaScriptCore (JSC) @@ -183,6 +183,7 @@ android { buildTypes { debug { signingConfig signingConfigs.debug + minifyEnabled enableProguardInBuilds } release { lintOptions { @@ -192,7 +193,7 @@ android { // Caution! In production, you need to generate your own keystore file. // see https://reactnative.dev/docs/signed-apk-android. signingConfig signingConfigs.release - minifyEnabled enableProguardInReleaseBuilds + minifyEnabled enableProguardInBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } diff --git a/android/build.gradle b/android/build.gradle index 26c752e096..6b0597810b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,7 +4,7 @@ buildscript { ext { buildToolsVersion = "33.0.0" minSdkVersion = 23 - compileSdkVersion = 33 + compileSdkVersion = 34 targetSdkVersion = 34 // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "21.4.7075529" diff --git a/ios/Inji/Inji.entitlements b/ios/Inji/Inji.entitlements index 960e8f19fd..eca3db956e 100644 --- a/ios/Inji/Inji.entitlements +++ b/ios/Inji/Inji.entitlements @@ -9,14 +9,18 @@ Default com.apple.developer.icloud-container-identifiers - + + iCloud.io.mosip.inji.wallet.mobileid + com.apple.developer.icloud-services CloudDocuments CloudKit com.apple.developer.ubiquity-container-identifiers - + + iCloud.io.mosip.inji.wallet.mobileid + com.apple.developer.ubiquity-kvstore-identifier $(TeamIdentifierPrefix)$(CFBundleIdentifier) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 8d8547bd25..48f3ea2ed5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -25,8 +25,6 @@ PODS: - ExpoModulesCore - ZXingObjC/OneD - ZXingObjC/PDF417 - - EXCamera (13.6.0): - - ExpoModulesCore - EXConstants (14.4.2): - ExpoModulesCore - EXFaceDetector (12.4.0): @@ -51,6 +49,10 @@ PODS: - ExpoModulesCore - GoogleSignIn (~> 7.0) - React-Core + - ExpoCamera (13.9.0): + - ExpoModulesCore + - ZXingObjC/OneD + - ZXingObjC/PDF417 - ExpoCrypto (12.6.0): - ExpoModulesCore - ExpoKeepAwake (12.3.0): @@ -564,7 +566,8 @@ PODS: - React-Core - RNPermissions (3.8.4): - React-Core - - RNScreens (3.20.0): + - RNScreens (3.32.0): + - RCT-Folly (= 2021.07.22.00) - React-Core - React-RCTImage - RNSecureRandom (1.0.1): @@ -603,7 +606,6 @@ DEPENDENCIES: - EASClient (from `../node_modules/expo-eas-client/ios`) - EXApplication (from `../node_modules/expo-application/ios`) - EXBarCodeScanner (from `../node_modules/expo-barcode-scanner/ios`) - - EXCamera (from `../node_modules/expo-camera/ios`) - EXConstants (from `../node_modules/expo-constants/ios`) - EXFaceDetector (from `../node_modules/expo-face-detector/ios`) - EXFileSystem (from `../node_modules/expo-file-system/ios`) @@ -613,6 +615,7 @@ DEPENDENCIES: - EXManifests (from `../node_modules/expo-manifests/ios`) - Expo (from `../node_modules/expo`) - "ExpoAdapterGoogleSignIn (from `../node_modules/@react-native-google-signin/google-signin/expo/ios`)" + - ExpoCamera (from `../node_modules/expo-camera/ios`) - ExpoCrypto (from `../node_modules/expo-crypto/ios`) - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`) - ExpoLocalAuthentication (from `../node_modules/expo-local-authentication/ios`) @@ -735,8 +738,6 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-application/ios" EXBarCodeScanner: :path: "../node_modules/expo-barcode-scanner/ios" - EXCamera: - :path: "../node_modules/expo-camera/ios" EXConstants: :path: "../node_modules/expo-constants/ios" EXFaceDetector: @@ -755,6 +756,8 @@ EXTERNAL SOURCES: :path: "../node_modules/expo" ExpoAdapterGoogleSignIn: :path: "../node_modules/@react-native-google-signin/google-signin/expo/ios" + ExpoCamera: + :path: "../node_modules/expo-camera/ios" ExpoCrypto: :path: "../node_modules/expo-crypto/ios" ExpoKeepAwake: @@ -914,7 +917,6 @@ SPEC CHECKSUMS: EASClient: 49f8ea858204eb4844d9fb386e5fb7920aee2e30 EXApplication: 042aa2e3f05258a16962ea1a9914bf288db9c9a1 EXBarCodeScanner: 8e23fae8d267dbef9f04817833a494200f1fce35 - EXCamera: 2dc2bd2828bca4e283018a0b5a84aec6639ff0b4 EXConstants: ce5bbea779da8031ac818c36bea41b10e14d04e1 EXFaceDetector: 7ea53dbcdeac3f98f409a43fe31ca22195efc900 EXFileSystem: f8b838a880254de42a5a7da20ed5ce12e2697c1b @@ -924,6 +926,7 @@ SPEC CHECKSUMS: EXManifests: cf66451b11b2c2f6464917528d792759f7fd6ce0 Expo: ba9abdf444dc6d2c05a82c4c1b51a2400beb6167 ExpoAdapterGoogleSignIn: 6c55782832b7fbdc2c27dac05ef00445c103b8f3 + ExpoCamera: c13580cc0964c9e462f76579a0de9f468a9c6e73 ExpoCrypto: 42485127a5968dda6f67ac5f2b42d3c0af31d7db ExpoKeepAwake: be4cbd52d9b177cde0fd66daa1913afa3161fc1d ExpoLocalAuthentication: 32919307c66fb3661caefa07e7811a95a7539d7b @@ -1011,7 +1014,7 @@ SPEC CHECKSUMS: RNGoogleSignin: aac5c1ec73422109dec1da770247a1e410dcc620 RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4 RNPermissions: f1b49dd05fa9b83993cd05a9ee115247944d8f1a - RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f + RNScreens: 0bd9eec783bed1032e02a4db9976dae1664a5c7b RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef RNShare: 0fad69ae2d71de9d1f7b9a43acf876886a6cb99c RNSVG: 07dbd870b0dcdecc99b3a202fa37c8ca163caec2 diff --git a/package-lock.json b/package-lock.json index 77176b804f..e3e4d03130 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "expo": "~49.0.23", "expo-auth-session": "^5.2.0", "expo-barcode-scanner": "~12.3.2", - "expo-camera": "^13.6.0", + "expo-camera": "^13.9.0", "expo-constants": "^14.4.2", "expo-face-detector": "12.4.0", "expo-font": "~11.1.1", @@ -86,7 +86,7 @@ "react-native-restart": "^0.0.24", "react-native-rsa-native": "^2.0.5", "react-native-safe-area-context": "4.5.0", - "react-native-screens": "~3.20.0", + "react-native-screens": "~3.32.0", "react-native-securerandom": "^1.0.1", "react-native-shimmer-placeholder": "^2.0.9", "react-native-spinkit": "^1.5.1", @@ -14105,9 +14105,10 @@ } }, "node_modules/expo-camera": { - "version": "13.6.0", - "resolved": "https://registry.npmjs.org/expo-camera/-/expo-camera-13.6.0.tgz", - "integrity": "sha512-8lxK15D2tuEZom9bhDMMqNPW+5241Ak4wIup/ebh4JekgOtSQ/egbq7qDn2FCFi+5vPFKX4nRsvGOuzfuzvmZA==", + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/expo-camera/-/expo-camera-13.9.0.tgz", + "integrity": "sha512-CaVEsBfgCXf7o0K8+POwoGCyas79FkNovyzzfkYn3pJ9D6H4HaGzpLf9DBVHPw7tHyPPSMzhNoFkiytqDYQsrw==", + "license": "MIT", "dependencies": { "invariant": "^2.2.4" }, @@ -25349,9 +25350,10 @@ } }, "node_modules/react-native-screens": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.20.0.tgz", - "integrity": "sha512-joWUKWAVHxymP3mL9gYApFHAsbd9L6ZcmpoZa6Sl3W/82bvvNVMqcfP7MeNqVCg73qZ8yL4fW+J/syusHleUgg==", + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.32.0.tgz", + "integrity": "sha512-wybqZAHX7v8ipOXhh90CqGLkBHw5JYqKNRBX7R/b0c2WQisTOgu0M0yGwBMM6LyXRBT+4k3NTGHdDbpJVpq0yQ==", + "license": "MIT", "dependencies": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" @@ -40496,9 +40498,9 @@ } }, "expo-camera": { - "version": "13.6.0", - "resolved": "https://registry.npmjs.org/expo-camera/-/expo-camera-13.6.0.tgz", - "integrity": "sha512-8lxK15D2tuEZom9bhDMMqNPW+5241Ak4wIup/ebh4JekgOtSQ/egbq7qDn2FCFi+5vPFKX4nRsvGOuzfuzvmZA==", + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/expo-camera/-/expo-camera-13.9.0.tgz", + "integrity": "sha512-CaVEsBfgCXf7o0K8+POwoGCyas79FkNovyzzfkYn3pJ9D6H4HaGzpLf9DBVHPw7tHyPPSMzhNoFkiytqDYQsrw==", "requires": { "invariant": "^2.2.4" } @@ -48822,9 +48824,9 @@ "requires": {} }, "react-native-screens": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.20.0.tgz", - "integrity": "sha512-joWUKWAVHxymP3mL9gYApFHAsbd9L6ZcmpoZa6Sl3W/82bvvNVMqcfP7MeNqVCg73qZ8yL4fW+J/syusHleUgg==", + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.32.0.tgz", + "integrity": "sha512-wybqZAHX7v8ipOXhh90CqGLkBHw5JYqKNRBX7R/b0c2WQisTOgu0M0yGwBMM6LyXRBT+4k3NTGHdDbpJVpq0yQ==", "requires": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" diff --git a/package.json b/package.json index ef78637514..511ca871f2 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "expo": "~49.0.23", "expo-auth-session": "^5.2.0", "expo-barcode-scanner": "~12.3.2", - "expo-camera": "^13.6.0", + "expo-camera": "^13.9.0", "expo-constants": "^14.4.2", "expo-face-detector": "12.4.0", "expo-font": "~11.1.1", @@ -89,7 +89,7 @@ "react-native-restart": "^0.0.24", "react-native-rsa-native": "^2.0.5", "react-native-safe-area-context": "4.5.0", - "react-native-screens": "~3.20.0", + "react-native-screens": "~3.32.0", "react-native-securerandom": "^1.0.1", "react-native-shimmer-placeholder": "^2.0.9", "react-native-spinkit": "^1.5.1",