react-native-iap 16.4.1 → 16.5.1

package/README.md

@@ -152,6 +152,7 @@ Other libraries built on OpenIAP: [expo-iap](https://github.com/hyodotdev/openia
 
 <!-- sponsors:start -->
 <!-- Generated by scripts/sync-sponsors.mjs from packages/docs/sponsor-registry.json. -->
+
 ## Sponsors
 
 <p align="center">
@@ -198,6 +199,7 @@ Supported the project before the OpenIAP sponsor program.
 [openiap-opencollective]: https://opencollective.com/openiap
 [openiap-paypal]: https://www.paypal.me/dooboolab
 [openiap-company-contact]: mailto:hyo@hyo.dev
+
 <!-- sponsors:end -->
 
 ## Community

package/android/build.gradle

@@ -79,12 +79,17 @@ if (!(googleVersion instanceof String) || !googleVersion.trim()) {
 def googleVersionString = googleVersion.trim()
 
 apply plugin: "com.android.library"
-apply plugin: 'org.jetbrains.kotlin.android'
+// AGP 9 registers Kotlin itself unless the consumer opts out.
+if (project.extensions.findByName('kotlin') == null) {
+  apply plugin: 'org.jetbrains.kotlin.android'
+}
 
 // Only apply Nitro autolinking if the file exists
 def nitroAutolinkingFile = file('../nitrogen/generated/android/NitroIap+autolinking.gradle')
 if (nitroAutolinkingFile.exists()) {
   apply from: nitroAutolinkingFile
+  // Built-in Kotlin does not compile custom java.srcDirs added by Nitrogen.
+  android.sourceSets.main.kotlin.srcDir('../nitrogen/generated/android/kotlin')
 }
 
 apply from: "./fix-prefab.gradle"
@@ -151,11 +156,11 @@ android {
   namespace = "com.margelo.nitro.iap"
 
   ndkVersion = getExtOrDefault("ndkVersion")
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  compileSdk = getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion = getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion = getExtOrIntegerDefault("targetSdkVersion")
+    minSdk = getExtOrIntegerDefault("minSdkVersion")
+    targetSdk = getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     // Ship consumer keep rules so Nitro HybridObjects aren't stripped in app release builds
     consumerProguardFiles 'consumer-rules.pro'
@@ -168,15 +173,6 @@ android {
         cppFlags "-frtti -fexceptions -Wall -Wextra -fstack-protector-all"
         arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
         abiFilters (*reactNativeArchitectures())
-
-        buildTypes {
-          debug {
-            cppFlags "-O1 -g"
-          }
-          release {
-            cppFlags "-O2"
-          }
-        }
       }
     }
   }
@@ -187,10 +183,8 @@ android {
     }
   }
 
-  packagingOptions {
-    excludes = [
-            "META-INF",
-            "META-INF/**",
+  packaging {
+    def excludedLibraries = [
             "**/libc++_shared.so",
             "**/libfbjni.so",
             "**/libjsi.so",
@@ -206,6 +200,8 @@ android {
             "**/libreact_nativemodule_core.so",
             "**/libjscexecutor.so"
     ]
+    resources.excludes += ["META-INF", "META-INF/**"] + excludedLibraries
+    jniLibs.excludes += excludedLibraries
   }
 
   buildFeatures {
@@ -214,8 +210,12 @@ android {
   }
 
   buildTypes {
+    debug {
+      externalNativeBuild.cmake.cppFlags "-O1 -g"
+    }
     release {
       minifyEnabled = false
+      externalNativeBuild.cmake.cppFlags "-O2"
     }
   }
   
@@ -224,11 +224,9 @@ android {
     targetCompatibility JavaVersion.VERSION_17
   }
   
-  lintOptions {
-    disable "GradleCompatible"
+  lint {
+    disable += "GradleCompatible"
   }
-
-  // Removed sourceSets configuration for codegen as it's not needed for library modules
 }
 
 kotlin {

package/android/fix-prefab.gradle

@@ -1,7 +1,5 @@
 tasks.configureEach { task ->
-  // Make sure that we generate our prefab publication file only after having built the native library
-  // so that not a header publication file, but a full configuration publication will be generated, which
-  // will include the .so file
+  // Publish prefab metadata only after its native library exists.
 
   def prefabConfigurePattern = ~/^prefab(.+)ConfigurePackage$/
   def matcher = task.name =~ prefabConfigurePattern
@@ -12,14 +10,16 @@ tasks.configureEach { task ->
   }
 }
 
-afterEvaluate {
+gradle.projectsEvaluated {
   def abis = reactNativeArchitectures()
   rootProject.allprojects.each { proj ->
     if (proj === rootProject) return
 
     def dependsOnThisLib = proj.configurations.findAll { it.canBeResolved }.any { config ->
-      config.dependencies.any { dep ->
-        dep.group == project.group && dep.name == project.name
+      config.allDependencies.any { dep ->
+        dep instanceof ProjectDependency
+            ? dep.path == project.path
+            : dep.group == project.group && dep.name == project.name
       }
     }
     if (!dependsOnThisLib && proj != project) return
@@ -28,24 +28,11 @@ afterEvaluate {
       return
     }
 
-    def variants = proj.android.hasProperty('applicationVariants') ? proj.android.applicationVariants : proj.android.libraryVariants
-    // Touch the prefab_config.json files to ensure that in ExternalNativeJsonGenerator.kt we will re-trigger the prefab CLI to
-    // generate a libnameConfig.cmake file that will contain our native library (.so).
-    // See this condition: https://cs.android.com/android-studio/platform/tools/base/+/mirror-goog-studio-main:build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ExternalNativeJsonGenerator.kt;l=207-219?q=createPrefabBuildSystemGlue
-    variants.all { variant ->
-      def variantName = variant.name
-      abis.each { abi ->
-        def searchDir = new File(proj.projectDir, ".cxx/${variantName}")
-        if (!searchDir.exists()) return
-        def matches = []
-        searchDir.eachDir { randomDir ->
-          def prefabFile = new File(randomDir, "${abi}/prefab_config.json")
-          if (prefabFile.exists()) matches << prefabFile
-        }
-        matches.each { prefabConfig ->
-          prefabConfig.setLastModified(System.currentTimeMillis())
-        }
-      }
+    // Refresh existing prefab metadata so CMake discovers newly built libraries.
+    proj.fileTree('.cxx') {
+      abis.each { abi -> include "*/*/${abi}/prefab_config.json" }
+    }.each { prefabConfig ->
+      prefabConfig.setLastModified(System.currentTimeMillis())
     }
   }
 }