Merge pull request #225 from zk-passport/fix-android

Fix android build

app/.gitattributes

@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated

app/.gitignore

@@ -21,6 +21,8 @@ DerivedData
 *.ipa
 *.xcuserstate
 ios/.xcode.env.local
+**/.xcode.env.local
+
 
 # Android/IntelliJ
 #
@@ -65,5 +67,14 @@ yarn-error.log
 /coverage
 
 .env
+**/Pods/
+
+.expo/
 
-.expo/
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

app/.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+# yarnPath: .yarn/releases/yarn-4.5.0.cjs

app/App.tsx

@@ -12,7 +12,7 @@ import useUserStore from './src/stores/userStore';
 import { bgWhite } from './src/utils/colors';
 global.Buffer = Buffer;
 
-function App(): JSX.Element {
+function App(): React.JSX.Element {
   const toast = useToastController();
   const setToast = useNavigationStore((state) => state.setToast);
   const initUserStore = useUserStore((state) => state.initUserStore);

app/Gemfile

@@ -3,4 +3,6 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.12'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

app/README.md

@@ -12,7 +12,7 @@
 ### Android
 | Requirement | Version | Installation Guide |
 |-------------|---------|--------------------|
-| Java        | 11      | [Install Java](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) or [GPT4 guide](https://chatgpt.com/share/26cd879b-26bb-4fd4-b59e-cfe002a06afe) |
+| Java        | 17      | [Install Java](https://www.oracle.com/java/technologies/javase-jdk17-downloads.html)|
 | Android Studio | Latest | [Install Android Studio](https://developer.android.com/studio) |
 | Android SDK | Latest  | [Install Android SDK](https://developer.android.com/studio#downloads) |
 | Android Ndk         | 23.1.7779620 | [Install NDK](https://developer.android.com/studio) or [GPT4 guide](https://chatgpt.com/share/a6e2544b-d32a-4554-a452-402511d03ffc) |

app/android/android-passport-reader/app/build.gradle

@@ -23,13 +23,13 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
+    // compileOptions {
+    //     sourceCompatibility JavaVersion.VERSION_11
+    //     targetCompatibility JavaVersion.VERSION_11
+    // }
+    // kotlinOptions {
+    //     jvmTarget = "11"
+    // }
 
 
 

app/android/android-passport-reader/build.gradle

@@ -7,9 +7,9 @@ buildscript {
         minSdkVersion rootProject.ext.minSdkVersion
         buildToolsVersion rootProject.ext.buildToolsVersion
 
-        kotlin_version = '1.7.20'
+        // kotlin_version = '1.7.20'
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
+        // ndkVersion = "23.1.7779620"
 
     }
 
@@ -21,7 +21,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
 
         // NOTE: Do not place your application dependencies here; they belong

app/android/android-passport-reader/gradle.properties

@@ -7,7 +7,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 android.defaults.buildfeatures.buildconfig=true
-android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true

app/android/android-passport-reader/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip

app/android/app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: 'kotlin-android'
 
 
@@ -9,14 +10,14 @@ apply plugin: 'kotlin-android'
  */
 react {
     /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
+    // root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
+    // reactNativeDir = file("../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+    // codegenDir = file("../../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
+    // cliFile = file("../../node_modules/react-native/cli.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -50,6 +51,9 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -73,6 +77,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 android {
     ndkVersion rootProject.ext.ndkVersion
 
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     namespace "com.proofofpassportapp"
@@ -143,23 +148,21 @@ dependencies {
 
     implementation 'com.github.blikoon:QRCodeScanner:0.1.2'
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
         implementation jscFlavor
     }
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation("net.java.dev.jna:jna:5.13.0@aar")
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android'
     implementation project(':react-native-fs')
 
     implementation 'com.google.code.gson:gson:2.8.9'
-}
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+    // implementation ('androidx.core:core:1.9.0') {
+    //     exclude group: 'com.android.support', module: 'support-compat'
+    // }
+    // implementation ('androidx.media:media:1.0.0') {
+    //     exclude group: 'com.android.support', module: 'support-media-compat'
+    // }
+}

app/android/app/src/debug/AndroidManifest.xml

@@ -10,7 +10,7 @@
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+        tools:ignore="GoogleAppIndexingWarning"
+    />
+
 </manifest>

app/android/app/src/main/AndroidManifest.xml

@@ -19,7 +19,8 @@
       android:roundIcon="@mipmap/ic_launcher"
       android:allowBackup="false"
       tools:replace="android:allowBackup, android:icon, android:roundIcon, android:name"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

app/android/app/src/main/cpp/CMakeLists.txt

@@ -25,11 +25,11 @@ set_target_properties(prove_rsa_65537_sha1 PROPERTIES IMPORTED_LOCATION ${CMAKE_
 add_library(prove_rsapss_65537_sha256 SHARED IMPORTED)
 set_target_properties(prove_rsapss_65537_sha256 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/lib/libwitnesscalc_prove_rsapss_65537_sha256.so)
 
-add_library(prove_ecdsa_secp256r1_sha256 SHARED IMPORTED)
-set_target_properties(prove_ecdsa_secp256r1_sha256 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/lib/libwitnesscalc_prove_ecdsa_secp256r1_sha256.so)
+# add_library(prove_ecdsa_secp256r1_sha256 SHARED IMPORTED)
+# set_target_properties(prove_ecdsa_secp256r1_sha256 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/lib/libwitnesscalc_prove_ecdsa_secp256r1_sha256.so)
 
-add_library(prove_ecdsa_secp256r1_sha1 SHARED IMPORTED)
-set_target_properties(prove_ecdsa_secp256r1_sha1 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/lib/libwitnesscalc_prove_ecdsa_secp256r1_sha1.so)
+# add_library(prove_ecdsa_secp256r1_sha1 SHARED IMPORTED)
+# set_target_properties(prove_ecdsa_secp256r1_sha1 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/lib/libwitnesscalc_prove_ecdsa_secp256r1_sha1.so)
 
 add_library(${CMAKE_PROJECT_NAME} SHARED
         proofofpassportapp.cpp)