react-native-cesium 1.2.14 → 1.2.16

package/README.md

@@ -153,6 +153,8 @@ What happens on **`./gradlew`** / Android Studio build:
 
 You still need a discoverable **Android NDK** (expand **Additional Android specific requirements** under [System dependencies](#system-dependencies) above) so that build can succeed.
 
+**Maintainers:** verify Android builds with **Gradle 9.3+** (as in React Native 0.85+ templates; this repo’s example app uses the wrapper under `example/android/gradle/wrapper/`).
+
 ### Building
 
 **Automatic (default):** assuming you have done the above and have all the required dependencies in place, when the native output is missing, the package tries to build it for you:

package/android/build.gradle

@@ -31,14 +31,12 @@ if (isNewArchitectureEnabled()) {
 
 def reactNativeCesiumPackageDir = projectDir.parentFile
 
-tasks.register('ensureCesiumNativeAndroid') {
+tasks.register('ensureCesiumNativeAndroid', Exec) {
   group 'cesium'
   description 'If vendor/android Cesium Native is missing, runs scripts/cesium/ensure-native.mjs (update + build). Can take a long time.'
-  doLast {
-    def marker = new File(reactNativeCesiumPackageDir, 'vendor/android/share/cesium-native/cmake/cesium-nativeConfig.cmake')
-    if (marker.exists()) {
-      return
-    }
+  def marker = new File(reactNativeCesiumPackageDir, 'vendor/android/share/cesium-native/cmake/cesium-nativeConfig.cmake')
+  onlyIf { !marker.exists() }
+  doFirst {
     if (System.getenv('REACT_NATIVE_CESIUM_SKIP_NATIVE_BUILD') == '1') {
       throw new RuntimeException(
         'react-native-cesium: Android Cesium Native artifacts are missing under vendor/android. ' +
@@ -46,11 +44,9 @@ tasks.register('ensureCesiumNativeAndroid') {
           'Or unset REACT_NATIVE_CESIUM_SKIP_NATIVE_BUILD to allow automatic build during Gradle. See package README.'
       )
     }
-    project.exec {
-      workingDir reactNativeCesiumPackageDir
-      commandLine 'node', 'scripts/cesium/ensure-native.mjs', '--android'
-    }
   }
+  workingDir reactNativeCesiumPackageDir
+  commandLine 'node', 'scripts/cesium/ensure-native.mjs', '--android'
 }
 
 tasks.preBuild {

package/android/cmake/spv_to_header.cmake

@@ -0,0 +1,41 @@
+# spv_to_header.cmake — Convert a .spv binary to a C header with an embedded uint32_t array.
+# Input variables: SPV_FILE, SPV_HEADER, ARRAY_NAME
+
+file(READ "${SPV_FILE}" SPV_DATA HEX)
+string(LENGTH "${SPV_DATA}" SPV_HEX_LEN)
+
+# Validate SPIR-V magic (0x07230203, little-endian on disk → "03022307")
+string(SUBSTRING "${SPV_DATA}" 0 8 SPV_MAGIC)
+string(TOLOWER "${SPV_MAGIC}" SPV_MAGIC_LC)
+if(NOT SPV_MAGIC_LC STREQUAL "03022307")
+  message(FATAL_ERROR "spv_to_header: '${SPV_FILE}' does not start with the SPIR-V magic number (got '${SPV_MAGIC}'). The file may be corrupt or not a valid SPIR-V binary.")
+endif()
+math(EXPR SPV_BYTE_COUNT "${SPV_HEX_LEN} / 2")
+math(EXPR SPV_WORD_COUNT "${SPV_BYTE_COUNT} / 4")
+
+set(HEADER_CONTENT "#pragma once\n#include <cstdint>\nstatic const uint32_t ${ARRAY_NAME}[] = {\n")
+
+set(I 0)
+while(I LESS SPV_HEX_LEN)
+  # Read 8 hex chars (4 bytes = 1 uint32_t word, little-endian in SPIR-V)
+  string(SUBSTRING "${SPV_DATA}" ${I} 8 WORD_HEX)
+  # SPIR-V is stored little-endian; file(READ HEX) gives bytes in order,
+  # so we need to reverse byte order for the uint32_t literal.
+  string(SUBSTRING "${WORD_HEX}" 0 2 B0)
+  string(SUBSTRING "${WORD_HEX}" 2 2 B1)
+  string(SUBSTRING "${WORD_HEX}" 4 2 B2)
+  string(SUBSTRING "${WORD_HEX}" 6 2 B3)
+  set(WORD "0x${B3}${B2}${B1}${B0}")
+
+  math(EXPR NEXT_I "${I} + 8")
+  if(NEXT_I LESS SPV_HEX_LEN)
+    string(APPEND HEADER_CONTENT "  ${WORD},\n")
+  else()
+    string(APPEND HEADER_CONTENT "  ${WORD}\n")
+  endif()
+  set(I ${NEXT_I})
+endwhile()
+
+string(APPEND HEADER_CONTENT "};\nstatic const uint32_t ${ARRAY_NAME}_size = sizeof(${ARRAY_NAME});\n")
+
+file(WRITE "${SPV_HEADER}" "${HEADER_CONTENT}")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-cesium",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "description": "Experimental Cesium rendering for React Native via Nitro",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
@@ -41,6 +41,7 @@
     "android/fix-prefab.gradle",
     "android/gradle.properties",
     "android/CMakeLists.txt",
+    "android/cmake",
     "android/src",
     "example/react-native-cesium-example.jpg",
     "ios/**/*.h",