@norcy/react-native-toolkit 0.2.34 → 0.2.36

package/android/dependencies.gradle

@@ -129,11 +129,30 @@ ext.applyCommonPlugins = { targetProject ->
     ]
 }
 
+ext.fixBundleResourcesDependency = { targetProject ->
+    // AGP 7.3.1 + Gradle 8.0 的 addGeneratedSourceDirectory 对 res 未正确建立任务依赖，
+    // 导致 mergeReleaseResources 在 createBundleReleaseJsAndAssets 之前执行，图片资源无法打入 APK
+    targetProject.afterEvaluate {
+        targetProject.android.applicationVariants.all { variant ->
+            def variantName = variant.name.capitalize()
+            def bundleTaskName = "createBundle${variantName}JsAndAssets"
+            def mergeTaskName = "merge${variantName}Resources"
+            def bundleTask = targetProject.tasks.findByName(bundleTaskName)
+            if (bundleTask) {
+                targetProject.tasks.named(mergeTaskName).configure {
+                    dependsOn(bundleTask)
+                }
+            }
+        }
+    }
+}
+
 ext.applyAll = { targetProject ->
     applyDefaultConfig(targetProject)
     applyBuildTypes(targetProject)
     applyCommonAndroidConfig(targetProject)
     applyCommonPlugins(targetProject)
     applyCommonDependencies(targetProject)
+    fixBundleResourcesDependency(targetProject)
 }
 

package/android/root.gradle

@@ -14,6 +14,13 @@ allprojects {
         google()
     }
 
+    configurations.all {
+        resolutionStrategy {
+            force 'androidx.viewpager2:viewpager2:1.0.0'
+            force 'androidx.annotation:annotation-experimental:1.3.1'
+        }
+    }
+
     afterEvaluate { project ->
         if (project.hasProperty("android")) {
             android {

package/package.json

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