Skip to content

Commit ed1098a

Browse files
chore(react.gladle): Remove gradle version check
1 parent 615df85 commit ed1098a

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

react.gradle

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -312,18 +312,16 @@ afterEvaluate {
312312
if (isAndroidLibrary) {
313313
into ("library_assets/${variant.name}/out")
314314
} else {
315-
// Workaround for Android Gradle Plugin 7.1 asset directory
316-
if (androidComponents.pluginVersion.major == 7 && androidComponents.pluginVersion.minor == 1) {
317-
into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
318-
}else{
319-
into ("assets/${targetPath}")
315+
into ("assets/${targetPath}")
320316

321-
// Workaround for Android Gradle Plugin 3.2+ new asset directory
322-
into ("merged_assets/${variant.name}/merge${targetName}Assets/out")
317+
// Workaround for Android Gradle Plugin 3.2+ new asset directory
318+
into ("merged_assets/${variant.name}/merge${targetName}Assets/out")
323319

324-
// Workaround for Android Gradle Plugin 3.4+ new asset directory
325-
into ("merged_assets/${variant.name}/out")
326-
}
320+
// Workaround for Android Gradle Plugin 3.4+ new asset directory
321+
into ("merged_assets/${variant.name}/out")
322+
323+
// Workaround for Android Gradle Plugin 7.1 asset directory
324+
into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
327325
}
328326
}
329327

0 commit comments

Comments
 (0)