@norcy/react-native-toolkit 0.2.37 → 0.2.38

package/android/dependencies.gradle

@@ -130,20 +130,17 @@ ext.applyCommonPlugins = { targetProject ->
 }
 
 ext.fixBundleResourcesDependency = { targetProject ->
-    // AGP 7.3.1 + Gradle 8.0 的 addGeneratedSourceDirectory 对 res 未正确建立任务依赖，
-    // 也未将生成目录注册为资源来源，导致 require() 的图片无法打入 release APK
+    // release 打包时须把 Metro 生成的 drawable 注册进 AGP，否则 JS 里 require 的本地图不会进 APK。
+    // 当前 RN Gradle 插件里声明的 resourcesDir 与 Metro 实际写入目录不一致，需用 registerGeneratedResFolders 指向真实路径。
+    // 可删除时机：升级 RN / @react-native/gradle-plugin 后，若官方已对齐路径或资源合并已正确，assembleRelease 验证本地图正常即可整段删掉。
     targetProject.afterEvaluate {
         targetProject.android.applicationVariants.all { variant ->
-            def variantName = variant.name.capitalize()
-            def bundleTaskName = "createBundle${variantName}JsAndAssets"
-            def mergeTaskName = "merge${variantName}Resources"
+            def variantCap = variant.name.capitalize()
+            def bundleTaskName = "createBundle${variantCap}JsAndAssets"
             def bundleTask = targetProject.tasks.findByName(bundleTaskName)
             if (bundleTask) {
-                def resDir = bundleTask.resourcesDir.get().asFile
-                targetProject.android.sourceSets[variant.name].res.srcDirs += [resDir]
-                targetProject.tasks.named(mergeTaskName).configure {
-                    dependsOn(bundleTask)
-                }
+                def resDir = new File(targetProject.buildDir, "RES/createBundle${variantCap}JsAndAssets")
+                variant.registerGeneratedResFolders(targetProject.files(resDir).builtBy(bundleTask))
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.2.37",
+  "version": "0.2.38",
   "private": false,
   "description": "My Toolkit",
   "main": "lib/commonjs/index",