Fixed rebase errors with module-info exclusion and moved dependencies

GradleUp · Sep 18, 2024 · 2bf56ae · 2bf56ae
1 parent 3ed4f3a
commit 2bf56ae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     implementation("org.codehaus.plexus:plexus-xml:4.0.4")
     implementation("org.apache.logging.log4j:log4j-core:2.24.0")
     implementation("org.vafer:jdependency:2.11")
+    implementation("com.google.code.gson:gson:2.11.0")
 
     testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") {
         exclude(group = "org.codehaus.groovy")

diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy
@@ -26,7 +26,6 @@ class ShadowJavaPlugin implements Plugin<Project> {
 
     public static final String MODULE_INFO_CLASS = 'module-info.class'
 
-    private final ProjectConfigurationActionContainer configurationActionContainer
     private final SoftwareComponentFactory softwareComponentFactory
 
     @Inject
@@ -103,9 +102,6 @@ class ShadowJavaPlugin implements Plugin<Project> {
                     project.configurations.findByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) ?:
                             project.configurations.runtime,
             ]
-            shadow.exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA', 'module-info.class')
-            shadow.configurations = [project.configurations.findByName('runtimeClasspath') ?
-                                             project.configurations.runtimeClasspath : project.configurations.runtime]
             /*
              Remove excludes like this:
              shadowJar {