From 2bf56ae7eb40fae0331edcea7a3fe43b5d695e6a Mon Sep 17 00:00:00 2001 From: Jan Diederich Date: Thu, 19 Sep 2024 00:21:16 +0200 Subject: [PATCH] Fixed rebase errors with module-info exclusion and moved dependencies --- build.gradle.kts | 1 + .../jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ffb5f832..51f79f74 100644 --- 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 index 244f7a87..4f7c4404 100644 --- 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 { 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.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 {