Skip to content

Mark Action parameters as non-null#1555

Merged
Goooler merged 3 commits intomainfrom
g/20250731/compat-old
Jul 31, 2025
Merged

Mark Action parameters as non-null#1555
Goooler merged 3 commits intomainfrom
g/20250731/compat-old

Conversation

@Goooler
Copy link
Copy Markdown
Member

@Goooler Goooler commented Jul 31, 2025 •
edited
Loading

  • CHANGELOG's "Unreleased" section has been updated, if applicable.

@Goooler Goooler force-pushed the g/20250731/compat-old branch from 63ecac9 to bdb850d Compare July 31, 2025 13:41
@Goooler

This comment was marked as outdated.

Sign in to view
@Goooler Goooler changed the title Prefer using non-null actions Mark Action parameters as non-null Jul 31, 2025
@Goooler Goooler requested a review from Copilot July 31, 2025 13:59

This comment was marked as outdated.

Sign in to view

@Goooler Goooler requested a review from Copilot July 31, 2025 14:06
Copilot AI reviewed Jul 31, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR converts nullable Action parameters to non-null across the Shadow plugin's API, improving type safety and simplifying the codebase by removing null checks and replacing null values with empty lambda expressions.

  • Remove nullable Action<*>? parameter types and make them non-null
  • Replace null action parameters with empty lambda expressions {}
  • Update the InheritManifest interface to use proper generic typing for Action parameters

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 9 comments.

Show a summary per file
File Description
ShadowSpec.kt Convert nullable Action parameters to non-null in interface methods
ShadowJar.kt Implement non-null Action parameters and remove null safety checks
InheritManifest.kt Update inheritFrom method to use properly typed Action parameter
DefaultInheritManifest.kt Remove null safety and type casting for Action parameter
README.md Add changelog entry for the API change

@Goooler
Copy link
Copy Markdown
Member Author

Goooler commented Jul 31, 2025 

OLD: shadow-9.0.0-SNAPSHOT-before.jar
NEW: shadow-9.0.0-SNAPSHOT-after.jar

 JAR   │ old       │ new       │ diff     
───────┼───────────┼───────────┼──────────
 class │ 470.6 KiB │ 476.3 KiB │ +5.7 KiB 
 other │  14.6 KiB │  14.6 KiB │      0 B 
───────┼───────────┼───────────┼──────────
 total │ 485.2 KiB │ 490.9 KiB │ +5.7 KiB 

 CLASSES │ old  │ new  │ diff         
─────────┼──────┼──────┼──────────────
 classes │   76 │   78 │  +2 (+2 -0)  
 methods │ 1232 │ 1248 │ +16 (+19 -3) 
  fields │  211 │  213 │  +2 (+2 -0)  

=================
====   JAR   ====
=================

 size     │ diff     │ path                                                                               
──────────┼──────────┼────────────────────────────────────────────────────────────────────────────────────
  1.8 KiB │ +1.8 KiB │ + com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar$transform$1.class     
  1.7 KiB │ +1.7 KiB │ + com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar$relocate$1.class      
  8.6 KiB │    -38 B │ ∆ com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.class 
    2 KiB │   +613 B │ ∆ com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.class           
 42.4 KiB │   +747 B │ ∆ com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.class                 
  5.8 KiB │   +960 B │ ∆ com/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec.class                
──────────┼──────────┼────────────────────────────────────────────────────────────────────────────────────
 62.2 KiB │ +5.7 KiB │ (total)                                                                            


=====================
====   CLASSES   ====
=====================

CLASSES:

   old │ new │ diff       
  ─────┼─────┼────────────
   76  │ 78  │ +2 (+2 -0) 
  
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$relocate$1
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$transform$1
  

METHODS:

   old  │ new  │ diff         
  ──────┼──────┼──────────────
   1232 │ 1248 │ +16 (+19 -3) 
  
  + com.github.jengelman.gradle.plugins.shadow.tasks.InheritManifest inheritFrom$lambda$0(ManifestMergeSpec)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar append$lambda$21(String, String, AppendingTransformer)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar createCopyAction$lambda$24(ShadowJar, File) → ZipOutputStream
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar mergeGroovyExtensionModules$lambda$20(GroovyExtensionModuleTransformer)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar mergeServiceFiles$lambda$18(ServiceFileTransformer)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar mergeServiceFiles$lambda$19(String, ServiceFileTransformer)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$relocate$1 <clinit>()
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$relocate$1 <init>()
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$relocate$1 execute(Relocator)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$relocate$1 execute(Object)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$transform$1 <clinit>()
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$transform$1 <init>()
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$transform$1 execute(ResourceTransformer)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$transform$1 execute(Object)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowSpec relocate$lambda$0(SimpleRelocator)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowSpec relocate$lambda$1(Relocator)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowSpec relocate$lambda$2(Relocator)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowSpec transform$lambda$3(ResourceTransformer)
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowSpec transform$lambda$4(ResourceTransformer)
  
  - com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar append$lambda$19(String, String, AppendingTransformer)
  - com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar createCopyAction$lambda$22(ShadowJar, File) → ZipOutputStream
  - com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar mergeServiceFiles$lambda$18(String, ServiceFileTransformer)
  

FIELDS:

   old │ new │ diff       
  ─────┼─────┼────────────
   211 │ 213 │ +2 (+2 -0) 
  
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$relocate$1 INSTANCE: ShadowJar$relocate$1
  + com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar$transform$1 INSTANCE: ShadowJar$transform$1

@Goooler Goooler enabled auto-merge (squash) July 31, 2025 14:09
@Goooler Goooler force-pushed the g/20250731/compat-old branch from 5f46cf6 to d2f01de Compare July 31, 2025 14:11
@Goooler Goooler merged commit b4f5d30 into main Jul 31, 2025
13 checks passed
@Goooler Goooler deleted the g/20250731/compat-old branch July 31, 2025 14:23
@Goooler Goooler mentioned this pull request Aug 1, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Goooler