Fix crash on release versions after AGP 7.3 bump

facebook · Sep 27, 2022 · 7cae9be · 7cae9be
1 parent f85e2ec
commit 7cae9be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
@@ -193,8 +193,8 @@ internal fun Project.configureReactTasks(variant: BaseVariant, config: ReactExte
           it.into(jsBundleDirConfigValue.get())
         } else {
           it.into(mergeAssetsTask.map { mergeFoldersTask -> mergeFoldersTask.outputDir.get() })
-          // Workaround for Android Gradle Plugin 7.1 asset directory
-          it.into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
+          // Workaround for Android Gradle Plugin 7.3 asset directory
+          it.into("$buildDir/intermediates/assets/${variant.name}")
         }
 
         it.dependsOn(mergeAssetsTask)

diff --git a/react.gradle b/react.gradle
@@ -387,7 +387,7 @@ afterEvaluate {
                     into ("merged_assets/${variant.name}/out")
 
                     // Workaround for Android Gradle Plugin 7.1 asset directory
-                    into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
+                    into("$buildDir/intermediates/assets/${variant.name}")
                 }
             }