@succinctlabs/react-native-zcam1 0.4.0-alpha.3 → 0.4.0-alpha.5

package/android/CMakeLists.txt

@@ -16,16 +16,23 @@ execute_process(
 # paths with Windows path separators.
 get_filename_component(UNIFFI_BINDGEN_PATH "${UNIFFI_BINDGEN_PATH}" DIRECTORY)
 
+option(ZCAM1_ENABLE_PROVING "Enable proving support" OFF)
+
 # Specifies a path to native header files.
 include_directories(
     ../cpp
     ../cpp/generated
-    ../cpp/proving
-    ../cpp/proving/generated
 
     ${UNIFFI_BINDGEN_PATH}/cpp/includes
 )
 
+if (ZCAM1_ENABLE_PROVING)
+  include_directories(
+      ../cpp/proving
+      ../cpp/proving/generated
+  )
+endif()
+
 add_library(zcam1-sdk SHARED
     ../cpp/zcam1-sdk.cpp
     ../cpp/generated/zcam1_c2pa_utils.cpp
@@ -35,12 +42,14 @@ add_library(zcam1-sdk SHARED
     cpp-adapter.cpp
 )
 
-add_library(zcam1-proving SHARED
-    ../cpp/proving/zcam1-proving.cpp
-    ../cpp/proving/generated/zcam1_common.cpp
-    ../cpp/proving/generated/zcam1_proving_utils.cpp
-    cpp-adapter-proving.cpp
-)
+if (ZCAM1_ENABLE_PROVING)
+  add_library(zcam1-proving SHARED
+      ../cpp/proving/zcam1-proving.cpp
+      ../cpp/proving/generated/zcam1_common.cpp
+      ../cpp/proving/generated/zcam1_proving_utils.cpp
+      cpp-adapter-proving.cpp
+  )
+endif()
 
 # Set C++ compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
@@ -55,21 +64,23 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size
 
 cmake_path(
   SET MY_RUST_LIB
-  ${CMAKE_SOURCE_DIR}/../Zcam1Jni/${ANDROID_ABI}/libzcam1_bindings.a
+  ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libzcam1_bindings.a
 
   NORMALIZE
 )
 add_library(my_rust_lib STATIC IMPORTED)
 set_target_properties(my_rust_lib PROPERTIES IMPORTED_LOCATION ${MY_RUST_LIB})
 
-cmake_path(
-  SET MY_RUST_PROVING_LIB
-  ${CMAKE_SOURCE_DIR}/../Zcam1ProvingJni/${ANDROID_ABI}/libzcam1_proving_bindings.a
+if (ZCAM1_ENABLE_PROVING)
+  cmake_path(
+    SET MY_RUST_PROVING_LIB
+    ${CMAKE_SOURCE_DIR}/src/main/jniProvingLibs/${ANDROID_ABI}/libzcam1_proving_bindings.a
 
-  NORMALIZE
-)
-add_library(my_rust_proving_lib STATIC IMPORTED)
-set_target_properties(my_rust_proving_lib PROPERTIES IMPORTED_LOCATION ${MY_RUST_PROVING_LIB})
+    NORMALIZE
+  )
+  add_library(my_rust_proving_lib STATIC IMPORTED)
+  set_target_properties(my_rust_proving_lib PROPERTIES IMPORTED_LOCATION ${MY_RUST_PROVING_LIB})
+endif()
 
 # Add ReactAndroid libraries, being careful to account for different versions.
 find_package(ReactAndroid REQUIRED CONFIG)
@@ -85,16 +96,20 @@ endif()
 # This if-then-else can be removed once this library does not support version below 0.76
 if (REACTNATIVE_MERGED_SO)
   target_link_libraries(zcam1-sdk ReactAndroid::reactnative)
-  target_link_libraries(zcam1-proving ReactAndroid::reactnative)
+  if (ZCAM1_ENABLE_PROVING)
+    target_link_libraries(zcam1-proving ReactAndroid::reactnative)
+  endif()
 else()
   target_link_libraries(zcam1-sdk
     ReactAndroid::turbomodulejsijni
     ReactAndroid::react_nativemodule_core
   )
-  target_link_libraries(zcam1-proving
-    ReactAndroid::turbomodulejsijni
-    ReactAndroid::react_nativemodule_core
-  )
+  if (ZCAM1_ENABLE_PROVING)
+    target_link_libraries(zcam1-proving
+      ReactAndroid::turbomodulejsijni
+      ReactAndroid::react_nativemodule_core
+    )
+  endif()
 endif()
 
 find_package(fbjni REQUIRED CONFIG)
@@ -105,10 +120,12 @@ target_link_libraries(
   ${LOGCAT}
   my_rust_lib
 )
-target_link_libraries(
-  zcam1-proving
-  fbjni::fbjni
-  ReactAndroid::jsi
-  ${LOGCAT}
-  my_rust_proving_lib
-)
+if (ZCAM1_ENABLE_PROVING)
+  target_link_libraries(
+    zcam1-proving
+    fbjni::fbjni
+    ReactAndroid::jsi
+    ${LOGCAT}
+    my_rust_proving_lib
+  )
+endif()

package/android/build.gradle

@@ -23,11 +23,31 @@ def getPackageVersion() {
   return packageJson.version
 }
 
+// Proving is opt-in.
+//
+// Enable proving in one of these ways:
+//
+// 1) Environment variable (works for Expo + non-Expo):
+//    ZCAM1_ENABLE_PROVING=1 ./gradlew ...
+//
+// 2) gradle.properties (recommended for Expo plugins):
+//    android/gradle.properties:
+//      enableProving=true
+//
+def isProvingEnabled() {
+  def fromEnv = System.getenv("ZCAM1_ENABLE_PROVING")
+  if (fromEnv == "1" || fromEnv?.toLowerCase() == "true") return true
+  def fromProps = rootProject.findProperty("enableProving") ?: project.findProperty("enableProving")
+  return fromProps == "true" || fromProps == true
+}
+
+def enableProving = isProvingEnabled()
+
 task downloadJniLibs {
   def version = getPackageVersion()
   def baseUrl = "https://github.com/succinctlabs/zcam1-sdk/releases/download/react-native-zcam1-v${version}"
-  def jniLibsDir = file("../Zcam1Jni")
-  def jniLibsProvingDir = file("../Zcam1ProvingJni")
+  def jniLibsDir = file("src/main/jniLibs")
+  def jniLibsProvingDir = file("src/main/jniProvingLibs")
   def markerFile = file(".jnilibs-version")
 
   doFirst {
@@ -36,7 +56,12 @@ task downloadJniLibs {
     // - dir present, marker absent → Yalc/local dev (package includes JNI libs), skip
     // - dir present, marker present, version differs → re-download (public npm upgrade)
     // - dir present, marker present, version matches → already up to date, skip
-    [Zcam1Jni: jniLibsDir, Zcam1ProvingJni: jniLibsProvingDir].each { name, dir ->
+    def libs = [Zcam1Jni: jniLibsDir]
+    if (enableProving) {
+      libs["Zcam1ProvingJni"] = jniLibsProvingDir
+    }
+
+    libs.each { name, dir ->
       def zipName = "${name}.zip"
       def zipUrl = "${baseUrl}/${zipName}"
 
@@ -44,11 +69,11 @@ task downloadJniLibs {
         println "Downloading ${name} v${version}..."
         exec {
           commandLine "curl", "-fL", zipUrl, "-o", zipName
-          workingDir ".."
+          workingDir "src/main"
         }
         exec {
           commandLine "unzip", "-q", zipName
-          workingDir ".."
+          workingDir "src/main"
         }
         new File("${projectDir}/../${zipName}").delete()
         markerFile.text = version
@@ -57,13 +82,13 @@ task downloadJniLibs {
         dir.deleteDir()
         exec {
           commandLine "curl", "-fL", zipUrl, "-o", zipName
-          workingDir ".."
+          workingDir "src/main"
         }
         exec {
           commandLine "unzip", "-q", zipName
-          workingDir ".."
+          workingDir "src/main"
         }
-        new File("${projectDir}/../${zipName}").delete()
+        new File("${projectDir}/src/main/${zipName}").delete()
         markerFile.text = version
       }
     }
@@ -72,21 +97,21 @@ task downloadJniLibs {
 
 afterEvaluate {
   preBuild.dependsOn downloadJniLibs
-}
+  // CMake build tasks don't depend on preBuild, so explicitly wire them to
+  // downloadJniLibs so the .a files are present before ninja links against them.
+  tasks.configureEach { task ->
+    if (task.name.startsWith("buildCMake") || task.name.startsWith("configureCMake")) {
+      task.dependsOn downloadJniLibs
+    }
+  }
 
-// With --configure-on-demand (used by Expo), the app's CMake configuration task can start
-// before the library's generateCodegenArtifactsFromSchema task is registered, breaking the
-// dependency chain that the React Native Gradle Plugin is supposed to set up automatically.
-// This explicitly wires the dependency after all projects are evaluated.
-if (isNewArchitectureEnabled()) {
-  gradle.projectsEvaluated {
-    def codegenTask = tasks.findByName('generateCodegenArtifactsFromSchema')
-    if (codegenTask) {
-      rootProject.subprojects { subproject ->
-        subproject.tasks.matching { it.name.startsWith('configureCMake') }.configureEach { cmakeTask ->
-          cmakeTask.dependsOn(codegenTask)
-        }
-      }
+  // The React Native gradle plugin does not wire the app's configureCMake task to depend
+  // on this module's generateCodegenArtifactsFromSchema, so on a fresh npm install the
+  // app's CMake configuration fails because the codegen JNI directory doesn't exist yet.
+  // Fix: make every app:configureCMake* task depend on our codegen task.
+  rootProject.findProject(":app")?.tasks?.configureEach { task ->
+    if (task.name.startsWith("configureCMake")) {
+      task.dependsOn tasks.named("generateCodegenArtifactsFromSchema")
     }
   }
 }
@@ -149,7 +174,7 @@ android {
     }
     externalNativeBuild {
       cmake {
-        arguments '-DANDROID_STL=c++_shared'
+        arguments '-DANDROID_STL=c++_shared', "-DZCAM1_ENABLE_PROVING=${enableProving ? '1' : '0'}"
         abiFilters (*reactNativeArchitectures())
       }
     }

package/app.plugin.js

@@ -1,11 +1,29 @@
 import ConfigPlugins from "@expo/config-plugins";
-const { withPodfileProperties } = ConfigPlugins;
+const { withPodfileProperties, withGradleProperties } = ConfigPlugins;
+
 function withZcam1Sdk(config, props) {
   const enableProving = !!(props && props.enableProving);
-  return withPodfileProperties(config, (config) => {
+
+  // iOS: write to Podfile.properties.json (read by Zcam1Sdk.podspec)
+  config = withPodfileProperties(config, (config) => {
     config.modResults.enableProving = enableProving ? "true" : "false";
     return config;
   });
+
+  // Android: write to gradle.properties (read by build.gradle)
+  config = withGradleProperties(config, (config) => {
+    config.modResults = config.modResults.filter(
+      (item) => !(item.type === "property" && item.key === "enableProving")
+    );
+    config.modResults.push({
+      type: "property",
+      key: "enableProving",
+      value: enableProving ? "true" : "false",
+    });
+    return config;
+  });
+
+  return config;
 }
 
 export { withZcam1Sdk as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@succinctlabs/react-native-zcam1",
-  "version": "0.4.0-alpha.3",
+  "version": "0.4.0-alpha.5",
   "description": "ZCAM1 SDK",
   "main": "./lib/module/index.js",
   "codegenConfig": {
@@ -77,14 +77,14 @@
     "ubrn:web": "ubrn build web",
     "clean": "rm -rfv cpp/ android/CMakeLists.txt android/src/main/java android/*.cpp ios/ src/generated/",
     "build": "bob build",
-    "prepack": "npm run ubrn:ios -- --release && npm run ubrn:ios:proving -- --release && npm run ubrn:android -- --release && npm run ubrn:android:proving -- --release && npm run build && if [ -z \"$NPM_CONFIG_REGISTRY\" ]; then mv Zcam1Framework.xcframework Zcam1Framework.xcframework.excluded && mv Zcam1ProvingFramework.xcframework Zcam1ProvingFramework.xcframework.excluded && mv Zcam1Jni Zcam1Jni.excluded && mv Zcam1ProvingJni Zcam1ProvingJni.excluded; fi",
+    "prepack": "npm run ubrn:ios -- --release && npm run ubrn:ios:proving -- --release && npm run ubrn:android -- --release && npm run ubrn:android:proving -- --release && npm run build && if [ -z \"$NPM_CONFIG_REGISTRY\" ]; then mv Zcam1Framework.xcframework Zcam1Framework.xcframework.excluded && mv Zcam1ProvingFramework.xcframework Zcam1ProvingFramework.xcframework.excluded && mv android/src/main/jniLibs android/src/main/jniLibs.excluded && mv android/src/main/jniProvingLibs android/src/main/jniProvingLibs.excluded; fi",
     "lint": "eslint src/",
     "lint:fix": "eslint src/ --fix",
     "format": "prettier --write \"src/**/*.{ts,tsx}\"",
     "format:check": "prettier --check \"src/**/*.{ts,tsx}\"",
-    "preyalcpublish": "mv Zcam1Framework.xcframework.excluded Zcam1Framework.xcframework && mv Zcam1ProvingFramework.xcframework.excluded Zcam1ProvingFramework.xcframework && mv Zcam1Jni.excluded Zcam1Jni && mv Zcam1ProvingJni.excluded Zcam1ProvingJni",
-    "postyalcpublish": "mv Zcam1Framework.xcframework Zcam1Framework.xcframework.excluded && mv Zcam1ProvingFramework.xcframework Zcam1ProvingFramework.xcframework.excluded && mv Zcam1Jni Zcam1Jni.excluded && mv Zcam1ProvingJni Zcam1ProvingJni.excluded",
-    "postpublish": "if [ -e Zcam1Framework.xcframework.excluded ]; then mv Zcam1Framework.xcframework.excluded Zcam1Framework.xcframework && mv Zcam1ProvingFramework.xcframework.excluded Zcam1ProvingFramework.xcframework && mv Zcam1Jni.excluded Zcam1Jni && mv Zcam1ProvingJni.excluded Zcam1ProvingJni; fi"
+    "preyalcpublish": "mv Zcam1Framework.xcframework.excluded Zcam1Framework.xcframework && mv Zcam1ProvingFramework.xcframework.excluded Zcam1ProvingFramework.xcframework && mv android/src/main/jniLibs.excluded android/src/main/jniLibs && mv android/src/main/jniProvingLibs.excluded android/src/main/jniProvingLibs",
+    "postyalcpublish": "mv Zcam1Framework.xcframework Zcam1Framework.xcframework.excluded && mv Zcam1ProvingFramework.xcframework Zcam1ProvingFramework.xcframework.excluded && mv android/src/main/jniLibs android/src/main/jniLibs.excluded && mv android/src/main/jniProvingLibs android/src/main/jniProvingLibs.excluded",
+    "postpublish": "if [ -e Zcam1Framework.xcframework.excluded ]; then mv Zcam1Framework.xcframework.excluded Zcam1Framework.xcframework && mv Zcam1ProvingFramework.xcframework.excluded Zcam1ProvingFramework.xcframework && mv android/src/main/jniLibs.excluded android/src/main/jniLibs && mv android/src/main/jniProvingLibs.excluded android/src/main/jniProvingLibs; fi"
   },
   "files": [
     "src",
@@ -96,11 +96,11 @@
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__",
+    "!android/src/main/jniLibs.excluded",
+    "!android/src/main/jniProvingLibs.excluded",
     "*.podspec",
     "Zcam1Framework.xcframework",
     "Zcam1ProvingFramework.xcframework",
-    "Zcam1Jni",
-    "Zcam1ProvingJni",
     "app.plugin.js",
     "react-native.config.js",
     "turbo.json"