From 1311f71147d4bc243952ea972f249099481c3f91 Mon Sep 17 00:00:00 2001 From: julien Date: Thu, 26 Feb 2026 13:45:08 +0100 Subject: [PATCH 1/2] fix: android build for npm installs - Move `ZstdPackage.kt` to `com.reactnativezstd` to match Android namespace, fixing autolinking - Add `externals/zstd/build/cmake` and `lib/libzstd.pc.in` to `files` for npm builds - Set white background in example app --- .../com/margelo/nitro/zstd/ZstdPackage.kt | 21 ------------------- example/src/App.tsx | 1 + .../nitro/zstd/reactnativezstdOnLoad.kt | 2 +- .../android/reactnativezstd+autolinking.cmake | 2 +- .../reactnativezstd+autolinking.gradle | 2 +- .../android/reactnativezstdOnLoad.cpp | 2 +- .../android/reactnativezstdOnLoad.hpp | 2 +- nitrogen/generated/ios/Zstd+autolinking.rb | 2 +- .../generated/ios/Zstd-Swift-Cxx-Bridge.cpp | 2 +- .../generated/ios/Zstd-Swift-Cxx-Bridge.hpp | 2 +- .../generated/ios/Zstd-Swift-Cxx-Umbrella.hpp | 2 +- nitrogen/generated/ios/ZstdAutolinking.mm | 2 +- nitrogen/generated/ios/ZstdAutolinking.swift | 2 +- .../generated/shared/c++/HybridZstdSpec.cpp | 2 +- .../generated/shared/c++/HybridZstdSpec.hpp | 2 +- package.json | 2 ++ 16 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 android/src/main/java/com/margelo/nitro/zstd/ZstdPackage.kt diff --git a/android/src/main/java/com/margelo/nitro/zstd/ZstdPackage.kt b/android/src/main/java/com/margelo/nitro/zstd/ZstdPackage.kt deleted file mode 100644 index 3c654bf..0000000 --- a/android/src/main/java/com/margelo/nitro/zstd/ZstdPackage.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.margelo.nitro.zstd - -import com.facebook.react.BaseReactPackage -import com.facebook.react.bridge.NativeModule -import com.facebook.react.bridge.ReactApplicationContext -import com.facebook.react.module.model.ReactModuleInfoProvider - -class ZstdPackage : BaseReactPackage() { - override fun getModule( - name: String, - reactContext: ReactApplicationContext, - ): NativeModule? = null - - override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider { HashMap() } - - companion object { - init { - reactnativezstdOnLoad.initializeNative() - } - } -} diff --git a/example/src/App.tsx b/example/src/App.tsx index c0095e9..d096644 100644 --- a/example/src/App.tsx +++ b/example/src/App.tsx @@ -36,6 +36,7 @@ const styles = StyleSheet.create({ flex: 1, alignItems: 'center', justifyContent: 'center', + backgroundColor: '#fff', }, box: { width: 60, diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/zstd/reactnativezstdOnLoad.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/zstd/reactnativezstdOnLoad.kt index 37d306f..bf0356a 100644 --- a/nitrogen/generated/android/kotlin/com/margelo/nitro/zstd/reactnativezstdOnLoad.kt +++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/zstd/reactnativezstdOnLoad.kt @@ -2,7 +2,7 @@ /// reactnativezstdOnLoad.kt /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// package com.margelo.nitro.zstd diff --git a/nitrogen/generated/android/reactnativezstd+autolinking.cmake b/nitrogen/generated/android/reactnativezstd+autolinking.cmake index 660fd5c..8379508 100644 --- a/nitrogen/generated/android/reactnativezstd+autolinking.cmake +++ b/nitrogen/generated/android/reactnativezstd+autolinking.cmake @@ -2,7 +2,7 @@ # reactnativezstd+autolinking.cmake # This file was generated by nitrogen. DO NOT MODIFY THIS FILE. # https://github.com/mrousavy/nitro -# Copyright © 2025 Marc Rousavy @ Margelo +# Copyright © 2026 Marc Rousavy @ Margelo # # This is a CMake file that adds all files generated by Nitrogen diff --git a/nitrogen/generated/android/reactnativezstd+autolinking.gradle b/nitrogen/generated/android/reactnativezstd+autolinking.gradle index 7861745..a4434cc 100644 --- a/nitrogen/generated/android/reactnativezstd+autolinking.gradle +++ b/nitrogen/generated/android/reactnativezstd+autolinking.gradle @@ -2,7 +2,7 @@ /// reactnativezstd+autolinking.gradle /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// /// This is a Gradle file that adds all files generated by Nitrogen diff --git a/nitrogen/generated/android/reactnativezstdOnLoad.cpp b/nitrogen/generated/android/reactnativezstdOnLoad.cpp index db7497a..432dd6f 100644 --- a/nitrogen/generated/android/reactnativezstdOnLoad.cpp +++ b/nitrogen/generated/android/reactnativezstdOnLoad.cpp @@ -2,7 +2,7 @@ /// reactnativezstdOnLoad.cpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #ifndef BUILDING_REACTNATIVEZSTD_WITH_GENERATED_CMAKE_PROJECT diff --git a/nitrogen/generated/android/reactnativezstdOnLoad.hpp b/nitrogen/generated/android/reactnativezstdOnLoad.hpp index c67cb85..6278812 100644 --- a/nitrogen/generated/android/reactnativezstdOnLoad.hpp +++ b/nitrogen/generated/android/reactnativezstdOnLoad.hpp @@ -2,7 +2,7 @@ /// reactnativezstdOnLoad.hpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #include diff --git a/nitrogen/generated/ios/Zstd+autolinking.rb b/nitrogen/generated/ios/Zstd+autolinking.rb index 2c9360d..1eb793f 100644 --- a/nitrogen/generated/ios/Zstd+autolinking.rb +++ b/nitrogen/generated/ios/Zstd+autolinking.rb @@ -2,7 +2,7 @@ # Zstd+autolinking.rb # This file was generated by nitrogen. DO NOT MODIFY THIS FILE. # https://github.com/mrousavy/nitro -# Copyright © 2025 Marc Rousavy @ Margelo +# Copyright © 2026 Marc Rousavy @ Margelo # # This is a Ruby script that adds all files generated by Nitrogen diff --git a/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.cpp b/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.cpp index cdafcd8..264ba86 100644 --- a/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.cpp +++ b/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.cpp @@ -2,7 +2,7 @@ /// Zstd-Swift-Cxx-Bridge.cpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #include "Zstd-Swift-Cxx-Bridge.hpp" diff --git a/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.hpp b/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.hpp index 745b660..cb0b9bf 100644 --- a/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.hpp +++ b/nitrogen/generated/ios/Zstd-Swift-Cxx-Bridge.hpp @@ -2,7 +2,7 @@ /// Zstd-Swift-Cxx-Bridge.hpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #pragma once diff --git a/nitrogen/generated/ios/Zstd-Swift-Cxx-Umbrella.hpp b/nitrogen/generated/ios/Zstd-Swift-Cxx-Umbrella.hpp index be3e161..bb558ee 100644 --- a/nitrogen/generated/ios/Zstd-Swift-Cxx-Umbrella.hpp +++ b/nitrogen/generated/ios/Zstd-Swift-Cxx-Umbrella.hpp @@ -2,7 +2,7 @@ /// Zstd-Swift-Cxx-Umbrella.hpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #pragma once diff --git a/nitrogen/generated/ios/ZstdAutolinking.mm b/nitrogen/generated/ios/ZstdAutolinking.mm index cf3a5e3..3365ef5 100644 --- a/nitrogen/generated/ios/ZstdAutolinking.mm +++ b/nitrogen/generated/ios/ZstdAutolinking.mm @@ -2,7 +2,7 @@ /// ZstdAutolinking.mm /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #import diff --git a/nitrogen/generated/ios/ZstdAutolinking.swift b/nitrogen/generated/ios/ZstdAutolinking.swift index 7e3502c..a7b5a5c 100644 --- a/nitrogen/generated/ios/ZstdAutolinking.swift +++ b/nitrogen/generated/ios/ZstdAutolinking.swift @@ -2,7 +2,7 @@ /// ZstdAutolinking.swift /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// public final class ZstdAutolinking { diff --git a/nitrogen/generated/shared/c++/HybridZstdSpec.cpp b/nitrogen/generated/shared/c++/HybridZstdSpec.cpp index fdda2dd..9c94ecf 100644 --- a/nitrogen/generated/shared/c++/HybridZstdSpec.cpp +++ b/nitrogen/generated/shared/c++/HybridZstdSpec.cpp @@ -2,7 +2,7 @@ /// HybridZstdSpec.cpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #include "HybridZstdSpec.hpp" diff --git a/nitrogen/generated/shared/c++/HybridZstdSpec.hpp b/nitrogen/generated/shared/c++/HybridZstdSpec.hpp index cbb6a7c..e4a7f35 100644 --- a/nitrogen/generated/shared/c++/HybridZstdSpec.hpp +++ b/nitrogen/generated/shared/c++/HybridZstdSpec.hpp @@ -2,7 +2,7 @@ /// HybridZstdSpec.hpp /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE. /// https://github.com/mrousavy/nitro -/// Copyright © 2025 Marc Rousavy @ Margelo +/// Copyright © 2026 Marc Rousavy @ Margelo /// #pragma once diff --git a/package.json b/package.json index f909015..e3fd412 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,10 @@ "nitro.json", "*.podspec", "react-native.config.js", + "externals/zstd/build/cmake", "externals/zstd/lib/zstd.h", "externals/zstd/lib/zstd_errors.h", + "externals/zstd/lib/libzstd.pc.in", "externals/zstd/lib/common", "externals/zstd/lib/compress", "externals/zstd/lib/decompress", From 0273d9ecca1ecfd00cf057b0e27a400575e54c9e Mon Sep 17 00:00:00 2001 From: julien Date: Thu, 26 Feb 2026 21:31:18 +0100 Subject: [PATCH 2/2] chore: cleaning --- .../java/com/reactnativezstd/ZstdPackage.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 android/src/main/java/com/reactnativezstd/ZstdPackage.kt diff --git a/android/src/main/java/com/reactnativezstd/ZstdPackage.kt b/android/src/main/java/com/reactnativezstd/ZstdPackage.kt new file mode 100644 index 0000000..be6c37d --- /dev/null +++ b/android/src/main/java/com/reactnativezstd/ZstdPackage.kt @@ -0,0 +1,22 @@ +package com.reactnativezstd + +import com.facebook.react.BaseReactPackage +import com.facebook.react.bridge.NativeModule +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.module.model.ReactModuleInfoProvider +import com.margelo.nitro.zstd.reactnativezstdOnLoad + +class ZstdPackage : BaseReactPackage() { + override fun getModule( + name: String, + reactContext: ReactApplicationContext, + ): NativeModule? = null + + override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider { HashMap() } + + companion object { + init { + reactnativezstdOnLoad.initializeNative() + } + } +}