@norcy/react-native-toolkit 0.2.35 → 0.2.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -129,11 +129,32 @@ ext.applyCommonPlugins = { targetProject ->
129
129
  ]
130
130
  }
131
131
 
132
+ ext.fixBundleResourcesDependency = { targetProject ->
133
+ // AGP 7.3.1 + Gradle 8.0 的 addGeneratedSourceDirectory 对 res 未正确建立任务依赖,
134
+ // 也未将生成目录注册为资源来源,导致 require() 的图片无法打入 release APK
135
+ targetProject.afterEvaluate {
136
+ targetProject.android.applicationVariants.all { variant ->
137
+ def variantName = variant.name.capitalize()
138
+ def bundleTaskName = "createBundle${variantName}JsAndAssets"
139
+ def mergeTaskName = "merge${variantName}Resources"
140
+ def bundleTask = targetProject.tasks.findByName(bundleTaskName)
141
+ if (bundleTask) {
142
+ def resDir = bundleTask.resourcesDir.get().asFile
143
+ targetProject.android.sourceSets[variant.name].res.srcDirs += [resDir]
144
+ targetProject.tasks.named(mergeTaskName).configure {
145
+ dependsOn(bundleTask)
146
+ }
147
+ }
148
+ }
149
+ }
150
+ }
151
+
132
152
  ext.applyAll = { targetProject ->
133
153
  applyDefaultConfig(targetProject)
134
154
  applyBuildTypes(targetProject)
135
155
  applyCommonAndroidConfig(targetProject)
136
156
  applyCommonPlugins(targetProject)
137
157
  applyCommonDependencies(targetProject)
158
+ fixBundleResourcesDependency(targetProject)
138
159
  }
139
160
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@norcy/react-native-toolkit",
3
- "version": "0.2.35",
3
+ "version": "0.2.37",
4
4
  "private": false,
5
5
  "description": "My Toolkit",
6
6
  "main": "lib/commonjs/index",