From 7815de493dd9cf25fcc09d13ab2a66c05e37e3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20Marussy?= <kristof@marussy.com>
Date: Tue, 9 Jul 2024 18:07:04 +0200
Subject: [PATCH] build: do not build shadow jars

---
 .../refinery/gradle/java-application.gradle.kts   | 15 ++-------------
 subprojects/generator-cli/build.gradle.kts        |  7 +------
 subprojects/language-web/build.gradle.kts         | 12 ------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts
index c0c71829..68a44f47 100644
--- a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts
+++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts
@@ -9,7 +9,6 @@ import org.gradle.accessors.dm.LibrariesForLibs
 
 plugins {
 	application
-	id("io.github.goooler.shadow")
 	id("tools.refinery.gradle.java-conventions")
 }
 
@@ -26,16 +25,6 @@ dependencies {
 	implementation(enforcedPlatform(project(":refinery-bom-dependencies")))
 }
 
-// See https://github.com/johnrengelman/shadow/issues/586
-// https://github.com/johnrengelman/shadow/issues/651
-components.named<AdhocComponentWithVariants>("java") {
-	withVariantsFromConfiguration(configurations.shadowRuntimeElements.get()) {
-		skip()
-	}
-}
-
-for (taskName in listOf("distZip", "shadowDistTar", "shadowDistZip")) {
-	tasks.named(taskName) {
-		enabled = false
-	}
+tasks.distZip {
+	enabled = false
 }
diff --git a/subprojects/generator-cli/build.gradle.kts b/subprojects/generator-cli/build.gradle.kts
index b13fecea..edb13b65 100644
--- a/subprojects/generator-cli/build.gradle.kts
+++ b/subprojects/generator-cli/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -17,8 +17,3 @@ dependencies {
 application {
 	mainClass.set("tools.refinery.generator.cli.RefineryCli")
 }
-
-tasks.shadowJar {
-	// Silence Xtext warning.
-	append("plugin.properties")
-}
diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts
index f415ff80..bcc10030 100644
--- a/subprojects/language-web/build.gradle.kts
+++ b/subprojects/language-web/build.gradle.kts
@@ -44,18 +44,6 @@ tasks {
 		}
 	}
 
-	shadowJar {
-		dependsOn(webapp)
-		from(project.sourceSets.main.map { it.output })
-		exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "schema/*",
-				".options", ".api_description", "*.profile", "about.*", "about_*.html", "about_files/*",
-				"plugin.xml", "systembundle.properties", "profile.list", "META-INF/resources/xtext/**")
-		append("plugin.properties")
-		from(webapp) {
-			into("webapp")
-		}
-	}
-
 	register<JavaExec>("serve") {
 		dependsOn(webapp)
 		val mainRuntimeClasspath = sourceSets.main.map { it.runtimeClasspath }