Skip to content

Improve file type check for AAR #1987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 5 commits into from
Mar 19, 2026
+12 −2
Merged

Improve file type check for AAR #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
534329d
Initial plan
Copilot Mar 19, 2026
d997f5d
Update AAR detection to check actual file content instead of extension
Copilot Mar 19, 2026
fcf0a98
Update JavaPluginsTest.kt
Goooler Mar 19, 2026
f75a91c
Reformat
Goooler Mar 19, 2026
d1ea52b
Check extension as well
Goooler Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ class JavaPluginsTest : BasePluginTest() {

@Test
fun failBuildIfProcessingAar() {
val fooAarPath = path("foo.aar")
val fooAarPath = buildJar("foo.aar") { insert("AndroidManifest.xml", "<manifest/>") }

projectScript.appendText(
"""
Expand Down
12 changes: 11 additions & 1 deletion src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransf
import java.io.File
import java.io.IOException
import java.util.jar.JarFile
import java.util.zip.ZipException
import java.util.zip.ZipFile
import javax.inject.Inject
import kotlin.reflect.full.hasAnnotation
import org.apache.tools.zip.Zip64Mode
Expand Down Expand Up @@ -451,7 +453,7 @@ public abstract class ShadowJar : Jar() {
file.isDirectory -> {
from(file)
}
file.extension.equals("aar", ignoreCase = true) -> {
file.extension.equals("aar", ignoreCase = true) && file.isAar() -> {
val message =
"""
Shadowing AAR file is not supported.
Expand Down Expand Up @@ -666,3 +668,11 @@ public abstract class ShadowJar : Jar() {
}
}
}

private fun File.isAar(): Boolean =
try {
ZipFile(this).use { zip -> zip.getEntry("AndroidManifest.xml") != null }
} catch (_: ZipException) {
// File is not a valid ZIP, so it cannot be an AAR.
false
}