Skip to content

Simplify checks for Zip64RequiredException #1879

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

Closed
Goooler wants to merge 1 commit into from
+3 −3
Closed

Simplify checks for Zip64RequiredException #1879

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ constructor(
checkDuplicateEntries(zos)
}
} catch (e: Exception) {
if (e is Zip64RequiredException || e.cause is Zip64RequiredException) {
val message = if (e is Zip64RequiredException) e.message else e.cause?.message
val cause = e.cause
if (cause is Zip64RequiredException) {
throw Zip64RequiredException(
"""
$message
${cause.message}
Comment on lines +70 to +74
Copy link

Copilot AI Nov 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The simplified check misses the case where e itself is a Zip64RequiredException (not wrapped in another exception). The original code checked both e is Zip64RequiredException and e.cause is Zip64RequiredException, but the new code only checks the cause. This means if a Zip64RequiredException is thrown directly, it won't be caught here and users won't see the helpful error message about enabling zip64.

Consider restoring the check to handle both cases:

val cause = e.cause
if (e is Zip64RequiredException || cause is Zip64RequiredException) {
  val message = if (e is Zip64RequiredException) e.message else cause?.message
  throw Zip64RequiredException(
    """
      $message
      
      To build this archive, please enable the zip64 extension. e.g.
      ...

Copilot uses AI. Check for mistakes.

To build this archive, please enable the zip64 extension. e.g.
```kts
Expand Down