@javascriptcommon/react-native-xz 1.0.0 → 1.1.1

package/android/build.gradle

@@ -4,21 +4,26 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath "com.android.tools.build:gradle:7.4.2"
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
+    classpath "com.android.tools.build:gradle:8.2.2"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
   }
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
+apply plugin: "com.facebook.react"
+
+def safeExtGet(prop, fallback) {
+  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
 
 android {
   namespace "com.xz"
-  compileSdkVersion 34
+  compileSdkVersion safeExtGet('compileSdkVersion', 34)
 
   defaultConfig {
-    minSdkVersion 21
-    targetSdkVersion 34
+    minSdkVersion safeExtGet('minSdkVersion', 24)
+    targetSdkVersion safeExtGet('targetSdkVersion', 34)
   }
 
   sourceSets {
@@ -28,12 +33,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
 

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.xz">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

package/android/src/main/java/com/xz/XzModule.kt

@@ -2,9 +2,8 @@ package com.xz
 
 import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
+import com.facebook.react.module.annotations.ReactModule
 import org.tukaani.xz.XZInputStream
 import java.io.File
 import java.io.FileInputStream
@@ -14,16 +13,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class XzModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+@ReactModule(name = XzModule.NAME)
+class XzModule(reactContext: ReactApplicationContext) : NativeXzSpec(reactContext) {
 
     companion object {
+        const val NAME = "Xz"
         private const val TAG = "XzNative"
     }
 
-    override fun getName(): String = "Xz"
+    override fun getName(): String = NAME
 
-    @ReactMethod
-    fun decompressFile(inputPath: String, outputPath: String, promise: Promise) {
+    override fun decompressFile(inputPath: String, outputPath: String, promise: Promise) {
         Log.d(TAG, "decompressFile called, input: $inputPath, output: $outputPath")
         CoroutineScope(Dispatchers.IO).launch {
             try {
@@ -56,8 +56,7 @@ class XzModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModu
         }
     }
 
-    @ReactMethod
-    fun decompressToString(inputPath: String, promise: Promise) {
+    override fun decompressToString(inputPath: String, promise: Promise) {
         Log.d(TAG, "decompressToString called, input: $inputPath")
         CoroutineScope(Dispatchers.IO).launch {
             try {

package/android/src/main/java/com/xz/XzPackage.kt

@@ -1,16 +1,33 @@
 package com.xz
 
-import com.facebook.react.ReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
 
-class XzPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf(XzModule(reactContext))
+class XzPackage : BaseReactPackage() {
+
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return if (name == XzModule.NAME) {
+            XzModule(reactContext)
+        } else {
+            null
+        }
     }
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return emptyList()
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+            moduleInfos[XzModule.NAME] = ReactModuleInfo(
+                XzModule.NAME,
+                XzModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // isCxxModule
+                true    // isTurboModule
+            )
+            moduleInfos
+        }
     }
 }

package/ios/Xz.h

@@ -1,11 +1,4 @@
+// This header is only used for TurboModule conformance
 #ifdef RCT_NEW_ARCH_ENABLED
-#import "RNXzSpec/RNXzSpec.h"
-
-@interface Xz : NSObject <NativeXzSpec>
-#else
-#import <React/RCTBridgeModule.h>
-
-@interface Xz : NSObject <RCTBridgeModule>
+#import <RNXzSpec/RNXzSpec.h>
 #endif
-
-@end

package/ios/Xz.mm

@@ -1,5 +1,10 @@
 #import <React/RCTBridgeModule.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <RNXzSpec/RNXzSpec.h>
+#import <React/RCTBridge+Private.h>
+#endif
+
 @interface RCT_EXTERN_MODULE(Xz, NSObject)
 
 RCT_EXTERN_METHOD(decompressFile:(NSString *)inputPath
@@ -12,3 +17,18 @@ RCT_EXTERN_METHOD(decompressToString:(NSString *)inputPath
                   reject:(RCTPromiseRejectBlock)reject)
 
 @end
+
+#ifdef RCT_NEW_ARCH_ENABLED
+@interface Xz () <NativeXzSpec>
+@end
+
+@implementation Xz (TurboModule)
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeXzSpecJSI>(params);
+}
+
+@end
+#endif

package/ios/Xz.swift

@@ -11,25 +11,17 @@ class Xz: NSObject {
 
   @objc
   func decompressFile(_ inputPath: String, outputPath: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-    print("[Xz Native] decompressFile called, input: \(inputPath), output: \(outputPath)")
     DispatchQueue.global(qos: .userInitiated).async {
       do {
         let inputURL = URL(fileURLWithPath: inputPath)
         let outputURL = URL(fileURLWithPath: outputPath)
 
-        print("[Xz Native] Reading compressed file...")
         let compressedData = try Data(contentsOf: inputURL)
-        print("[Xz Native] Compressed size: \(compressedData.count) bytes")
-
-        print("[Xz Native] Decompressing...")
         let decompressedData = try XZArchive.unarchive(archive: compressedData)
-        print("[Xz Native] Decompressed size: \(decompressedData.count) bytes")
 
         try decompressedData.write(to: outputURL)
-        print("[Xz Native] Written to output file")
         resolve(outputPath)
       } catch {
-        print("[Xz Native] Error: \(error.localizedDescription)")
         reject("XZ_ERROR", "Failed to decompress XZ file: \(error.localizedDescription)", error)
       }
     }
@@ -37,29 +29,20 @@ class Xz: NSObject {
 
   @objc
   func decompressToString(_ inputPath: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-    print("[Xz Native] decompressToString called, input: \(inputPath)")
     DispatchQueue.global(qos: .userInitiated).async {
       do {
         let inputURL = URL(fileURLWithPath: inputPath)
 
-        print("[Xz Native] Reading compressed file...")
         let compressedData = try Data(contentsOf: inputURL)
-        print("[Xz Native] Compressed size: \(compressedData.count) bytes")
-
-        print("[Xz Native] Decompressing...")
         let decompressedData = try XZArchive.unarchive(archive: compressedData)
-        print("[Xz Native] Decompressed size: \(decompressedData.count) bytes")
 
         guard let string = String(data: decompressedData, encoding: .utf8) else {
-          print("[Xz Native] Error: Failed to decode as UTF-8")
           reject("XZ_ERROR", "Failed to decode decompressed data as UTF-8 string", nil)
           return
         }
 
-        print("[Xz Native] String length: \(string.count) characters")
         resolve(string)
       } catch {
-        print("[Xz Native] Error: \(error.localizedDescription)")
         reject("XZ_ERROR", "Failed to decompress XZ file: \(error.localizedDescription)", error)
       }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@javascriptcommon/react-native-xz",
-  "version": "1.0.0",
-  "description": "Native XZ/LZMA2 decompression for React Native",
+  "version": "1.1.1",
+  "description": "Native XZ/LZMA2 decompression for React Native (TurboModules)",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "source": "src/index.ts",
@@ -23,7 +23,8 @@
     "lzma",
     "lzma2",
     "compression",
-    "decompression"
+    "decompression",
+    "turbomodules"
   ],
   "repository": {
     "type": "git",
@@ -33,13 +34,12 @@
   "license": "MIT",
   "peerDependencies": {
     "react": "*",
-    "react-native": "*"
+    "react-native": ">=0.71.0"
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-native": "^0.72.0",
     "react": "^18.0.0",
-    "react-native": "^0.72.0",
+    "react-native": "^0.76.0",
     "typescript": "^5.0.0"
   },
   "codegenConfig": {

package/react-native-xz.podspec

@@ -1,7 +1,6 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "react-native-xz"
@@ -11,33 +10,12 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported }
+  s.platforms    = { :ios => "13.4" }
   s.source       = { :git => "https://github.com/Spicy-Sparks/react-native-xz.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,swift}"
-  s.swift_version = "5.0"
+  s.source_files = "ios/**/*.{h,m,mm}"
 
   s.dependency "SWCompression", "~> 4.8"
 
-  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
-  if respond_to?(:install_modules_dependencies, true)
-    install_modules_dependencies(s)
-  else
-    s.dependency "React-Core"
-
-    # Don't install the dependencies when we run `pod install` in the old architecture.
-    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-      s.pod_target_xcconfig    = {
-          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-      }
-      s.dependency "React-Codegen"
-      s.dependency "RCT-Folly"
-      s.dependency "RCTRequired"
-      s.dependency "RCTTypeSafety"
-      s.dependency "ReactCommon/turbomodule/core"
-    end
-  end
+  install_modules_dependencies(s)
 end

package/src/NativeXz.ts

@@ -0,0 +1,9 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  decompressFile(inputPath: string, outputPath: string): Promise<string>;
+  decompressToString(inputPath: string): Promise<string>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('Xz');

package/src/index.ts

@@ -1,26 +1,4 @@
-import { NativeModules, Platform } from 'react-native'
-
-const LINKING_ERROR =
-  `The package 'react-native-xz' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-  '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo Go\n'
-
-interface XzModule {
-  decompressFile(inputPath: string, outputPath: string): Promise<string>
-  decompressToString(inputPath: string): Promise<string>
-}
-
-const Xz: XzModule = NativeModules.Xz
-  ? NativeModules.Xz
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR)
-        },
-      }
-    )
+import NativeXz from './NativeXz';
 
 /**
  * Decompress an XZ file to a destination path
@@ -29,7 +7,7 @@ const Xz: XzModule = NativeModules.Xz
  * @returns Promise resolving to the output path
  */
 export function decompressFile(inputPath: string, outputPath: string): Promise<string> {
-  return Xz.decompressFile(inputPath, outputPath)
+  return NativeXz.decompressFile(inputPath, outputPath);
 }
 
 /**
@@ -38,10 +16,10 @@ export function decompressFile(inputPath: string, outputPath: string): Promise<s
  * @returns Promise resolving to the decompressed string content
  */
 export function decompressToString(inputPath: string): Promise<string> {
-  return Xz.decompressToString(inputPath)
+  return NativeXz.decompressToString(inputPath);
 }
 
 export default {
   decompressFile,
   decompressToString,
-}
+};