Merge pull request #59 from numandev1/fix/expo

fix: libcrypto.so issue for release android

Author: numandev1

.gitignore

@@ -63,3 +63,7 @@ android/keystores/debug.keystore
 lib/
 **prebuild.log
 example/ios/tmp.xcconfig
+
+src/type.ts
+cpp/crypto.cpp
+android/src/main/java/com/reactnativekeysjsi/PrivateKey.java

README.md

@@ -424,6 +424,14 @@ import static com.reactnativekeysjsi.KeysModule.getSecureFor;
 String secureValue = getSecureFor("BRANCH_KEY");   // key_test_omQ7YYKiq57vOqEJsdcsdfeEsiWkwxE
 ```
 
+#### Android troubleshoot
+
+- [Problems with Proguard](#problems-with-proguard)
+- [2 files found with path '\*\*/libcrypto.so](#2-files-found-with-path-libcryptoso)
+- [Advanced Android Setup for applicationIdSuffix](#advanced-android-setup-1)
+
+````
+
 ### iOS
 
 #### Public Keys
@@ -439,7 +447,7 @@ NSString *value = [Keys publicFor:@"API_URL"];   // https://example.com
 
 // or just fetch all keys
 NSDictionary *allKeys = [Keys public_keys];
-```
+````
 
 #### Secure Keys
 
@@ -544,6 +552,22 @@ If using Dexguard, the shrinking phase will remove resources it thinks are unuse
 
     -keepresources string/build_config_package
 
+### 2 files found with path '\*\*/libcrypto.so
+
+if you face `2 files found with path '**/libcrypto.so'` then
+inside android/app/build.gradle just add this:
+
+```
+android {
+...
+packagingOptions {
+        pickFirst 'lib/x86/libcrypto.so'
+        pickFirst 'lib/x86_64/libcrypto.so'
+        pickFirst 'lib/armeabi-v7a/libcrypto.so'
+        pickFirst 'lib/arm64-v8a/libcrypto.so'
+    }
+}
+
 ### Using node with nvm, fnm or notion
 
 Build failure in Xcode looks something like:
@@ -553,35 +577,41 @@ Build failure in Xcode looks something like:
 Change the **Pre-actions script** scripts in Xcode to:
 
 ```
+
 # Setup nvm and set node
+
 [ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
 
-if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
+if [[-s "$HOME/.nvm/nvm.sh"]]; then
 . "$HOME/.nvm/nvm.sh"
 elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
 . "$(brew --prefix nvm)/nvm.sh"
 fi
 
 # Set up the nodenv node version manager if present
-if [[ -x "$HOME/.nodenv/bin/nodenv" ]]; then
+
+if [[-x "$HOME/.nodenv/bin/nodenv"]]; then
 eval "$("$HOME/.nodenv/bin/nodenv" init -)"
 fi
 
 # Set up the fnm node version manager if present
-if [[ -s "$HOME/.fnm/fnm" ]]; then
-  eval "`$HOME/.fnm/fnm env --multi`"
+
+if [[-s "$HOME/.fnm/fnm"]]; then
+eval "`$HOME/.fnm/fnm env --multi`"
 fi
 
 # Trying notion
+
 if [ -z "$NODE_BINARY" ]; then
-if [[ -s "$HOME/.notion/bin/node" ]]; then
+if [[-s "$HOME/.notion/bin/node"]]; then
 export NODE_BINARY="$HOME/.notion/bin/node"
 fi
 fi
 
 [ -z "$NODE_BINARY" ] && export NODE_BINARY="node"
 
 $NODE_BINARY "${SRCROOT}/../node_modules/react-native-keys/keysIOS.js"
+
 ```
 
 # Alternative Package
@@ -597,3 +627,4 @@ If you are using the library in one of your projects, consider supporting it wit
 ## Meta
 
 Created by [Numan.dev](https://numan.dev/).
+```

android/build.gradle

@@ -150,17 +150,31 @@ android {
       path "CMakeLists.txt"
     }
   }
-    packagingOptions {
-    excludes = ['**/libc++_shared.so',
-                '**/libfbjni.so',
-                '**/libreactnativejni.so',
-                '**/libjsi.so',
-                '**/libreact_nativemodule_core.so',
-                '**/libturbomodulejsijni.so',
-                '**/libcrypto.so'
+
+  packagingOptions {
+    excludes = [
+      "**/libc++_shared.so",
+      "**/libfbjni.so",
+      "**/libreactnativejni.so",
+      "**/libjsi.so",
+      "**/libreact_nativemodule_core.so",
+      "**/libturbomodulejsijni.so",
+      "**/MANIFEST.MF",
+      ""
     ]
+    doNotStrip '**/*.so'
   }
+
   buildTypes {
+    debug {
+      packagingOptions {
+        doNotStrip '**/*.so'
+      }
+      minifyEnabled false
+      debuggable true
+      jniDebuggable true
+      renderscriptDebuggable true
+    }
     release {
       minifyEnabled false
     }

example/android/app/build.gradle

@@ -7,7 +7,7 @@ project.ext.keyFiles = [
    staging: "keys.staging.json"
 ]
 
-apply from: project(':reactNativeKeys').projectDir.getPath() + "/RNKeys.gradle"
+apply from: project(':react-native-keys').projectDir.getPath() + "/RNKeys.gradle"
 
 /**
  * This is the configuration block to customize your React Native Android app.
@@ -102,6 +102,12 @@ android {
         applicationIdSuffix ""
       }
     }
+  packagingOptions {
+    pickFirst 'lib/x86/libcrypto.so'
+    pickFirst 'lib/x86_64/libcrypto.so'
+    pickFirst 'lib/armeabi-v7a/libcrypto.so'
+    pickFirst 'lib/arm64-v8a/libcrypto.so'
+  }
     signingConfigs {
         debug {
             storeFile file('debug.keystore')
@@ -139,7 +145,6 @@ dependencies {
     } else {
         implementation jscFlavor
     }
-    implementation project(':reactNativeKeys')
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

example/android/settings.gradle

@@ -2,5 +2,3 @@ rootProject.name = 'KeysExample'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
-include ':reactNativeKeys'
-project(':reactNativeKeys').projectDir = new File(rootProject.projectDir, '../../android')

exampleExpo/android/app/build.gradle

@@ -66,7 +66,7 @@ def enableProguardInReleaseBuilds = (findProperty('android.enableProguardInRelea
 project.ext.IS_EXAMPLE = true;
 project.ext.DEFAULT_FILE_NAME = "keys.production.json"
 apply from: project(':react-native-keys').projectDir.getPath() + "/RNKeys.gradle"
-
+  
 
 /**
  * The preferred build flavor of JavaScriptCore (JSC)