add support for newer shadow gradle plugin id: com.gradleup.shadow

nebula-plugins · Aug 22, 2024 · 30c7d70 · 30c7d70
1 parent d849629
commit 30c7d70
Show file tree

Hide file tree

Showing 8 changed files with 985 additions and 867 deletions.
diff --git a/src/main/groovy/nebula/plugin/publishing/ivy/IvyShadowPublishPlugin.groovy b/src/main/groovy/nebula/plugin/publishing/ivy/IvyShadowPublishPlugin.groovy
@@ -19,35 +19,42 @@ class IvyShadowPublishPlugin implements Plugin<Project> {
     void apply(Project project) {
         project.afterEvaluate {
             project.plugins.withId('com.github.johnrengelman.shadow') {
-                Task shadowJarTask = project.tasks.findByName('shadowJar')
-                boolean jarTaskEnabled = project.tasks.findByName('jar').enabled
-                if (!jarTaskEnabled) {
-                    ShadowJarPublicationConfigurer.configureForJarDisabled(project)
-                } else {
-                    //presence of this configurations means that shadow jar plugin is version 6.+
-                    //all the configuration below is done for us there and we can skip
-                    if (project.configurations.findByName("shadowRuntimeElements") == null) {
-                        PublishingExtension publishing = project.extensions.getByType(PublishingExtension)
-                        publishing.publications(new Action<PublicationContainer>() {
-                            @Override
-                            void execute(PublicationContainer publications) {
-                                if (shadowJarTask) {
-                                    publications.withType(IvyPublication) { IvyPublication publication ->
-                                        publication.configurations {
-                                            'shadowRuntimeElements' {}
-                                        }
-                                        publication.artifact(shadowJarTask, new Action<IvyArtifact>() {
-                                            @Override
-                                            void execute(IvyArtifact ivyArtifact) {
-                                                ivyArtifact.setConf('shadowRuntimeElements')
-                                            }
-                                        })
-                                    }
+                configureProject(project)
+            }
+            project.plugins.withId('com.gradleup.shadow') {
+                configureProject(project)
+            }
+        }
+    }
+
+    private void configureProject(Project project) {
+        Task shadowJarTask = project.tasks.findByName('shadowJar')
+        boolean jarTaskEnabled = project.tasks.findByName('jar').enabled
+        if (!jarTaskEnabled) {
+            ShadowJarPublicationConfigurer.configureForJarDisabled(project)
+        } else {
+            //presence of this configurations means that shadow jar plugin is version 6.+
+            //all the configuration below is done for us there and we can skip
+            if (project.configurations.findByName("shadowRuntimeElements") == null) {
+                PublishingExtension publishing = project.extensions.getByType(PublishingExtension)
+                publishing.publications(new Action<PublicationContainer>() {
+                    @Override
+                    void execute(PublicationContainer publications) {
+                        if (shadowJarTask) {
+                            publications.withType(IvyPublication) { IvyPublication publication ->
+                                publication.configurations {
+                                    'shadowRuntimeElements' {}
                                 }
+                                publication.artifact(shadowJarTask, new Action<IvyArtifact>() {
+                                    @Override
+                                    void execute(IvyArtifact ivyArtifact) {
+                                        ivyArtifact.setConf('shadowRuntimeElements')
+                                    }
+                                })
                             }
-                        })
+                        }
                     }
-                }
+                })
             }
         }
     }

diff --git a/src/main/groovy/nebula/plugin/publishing/maven/MavenShadowPublishPlugin.groovy b/src/main/groovy/nebula/plugin/publishing/maven/MavenShadowPublishPlugin.groovy
@@ -18,27 +18,34 @@ class MavenShadowPublishPlugin implements Plugin<Project> {
     void apply(Project project) {
         project.afterEvaluate {
             project.plugins.withId('com.github.johnrengelman.shadow') {
-                Task shadowJarTask = project.tasks.findByName('shadowJar')
-                boolean jarTaskEnabled = project.tasks.findByName('jar').enabled
-                if (!jarTaskEnabled) {
-                    ShadowJarPublicationConfigurer.configureForJarDisabled(project)
-                } else {
-                    //presence of this configurations means that shadow jar plugin is version 6.+
-                    //all the configuration below is done for us there and we can skip
-                    if (project.configurations.findByName("shadowRuntimeElements") == null) {
-                        PublishingExtension publishing = project.extensions.getByType(PublishingExtension)
-                        publishing.publications(new Action<PublicationContainer>() {
-                            @Override
-                            void execute(PublicationContainer publications) {
-                                if (shadowJarTask) {
-                                    publications.withType(MavenPublication) { MavenPublication publication ->
-                                        publication.artifact(shadowJarTask)
-                                    }
-                                }
+                configureProject(project)
+            }
+            project.plugins.withId('com.gradleup.shadow') {
+                configureProject(project)
+            }
+        }
+    }
+
+    private void configureProject(Project project) {
+        Task shadowJarTask = project.tasks.findByName('shadowJar')
+        boolean jarTaskEnabled = project.tasks.findByName('jar').enabled
+        if (!jarTaskEnabled) {
+            ShadowJarPublicationConfigurer.configureForJarDisabled(project)
+        } else {
+            //presence of this configurations means that shadow jar plugin is version 6.+
+            //all the configuration below is done for us there and we can skip
+            if (project.configurations.findByName("shadowRuntimeElements") == null) {
+                PublishingExtension publishing = project.extensions.getByType(PublishingExtension)
+                publishing.publications(new Action<PublicationContainer>() {
+                    @Override
+                    void execute(PublicationContainer publications) {
+                        if (shadowJarTask) {
+                            publications.withType(MavenPublication) { MavenPublication publication ->
+                                publication.artifact(shadowJarTask)
                             }
-                        })
+                        }
                     }
-                }
+                })
             }
         }
     }