From 04bef1b3e8facf6c4c7b42b210754aba140b68f4 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sat, 11 May 2024 14:02:05 +0200 Subject: [PATCH 1/4] shadowJar support --- app/build.gradle.kts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1733fa1..04fbc13 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,9 +5,12 @@ * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.4/userguide/building_java_projects.html in the Gradle documentation. */ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + plugins { // Apply the application plugin to add support for building a CLI application in Java. application + id("com.github.johnrengelman.shadow") version "8.1.1" } repositories { @@ -41,3 +44,11 @@ tasks.named("test") { // Use JUnit Platform for unit tests. useJUnitPlatform() } + +tasks.withType { + archiveBaseName.set("xl") + archiveVersion.set("") + manifest { + attributes(mapOf("Main-Class" to "com.github.csolem.gradle.shadow.kotlin.example.App")) + } +} \ No newline at end of file From 99b9da9be1c34e74f9fa443b4ab7a1db8dedad21 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sat, 11 May 2024 14:06:58 +0200 Subject: [PATCH 2/4] Make build depend on shadowJar --- app/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 04fbc13..a6701b3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -51,4 +51,9 @@ tasks.withType { manifest { attributes(mapOf("Main-Class" to "com.github.csolem.gradle.shadow.kotlin.example.App")) } +} + +// Set build to depend on shadowJar +tasks.named("build") { + dependsOn("shadowJar") } \ No newline at end of file From abc163fdb548ec26520c93c4760726c3d021dacc Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sat, 11 May 2024 14:07:16 +0200 Subject: [PATCH 3/4] Make build now lists built jars --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index b3ce6d2..3debf1d 100644 --- a/makefile +++ b/makefile @@ -10,7 +10,7 @@ watch: build: ./gradlew build - #./gradlew shadowJar + ls -lh app/build/libs/*.jar clean: ./gradlew clean From 0dca2fd27a5621143fd4d1e666fc5381b9fd66d4 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sat, 11 May 2024 14:09:35 +0200 Subject: [PATCH 4/4] Remove old gradle-init'd xl directory --- app/src/main/java/xl/App.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 app/src/main/java/xl/App.java diff --git a/app/src/main/java/xl/App.java b/app/src/main/java/xl/App.java deleted file mode 100644 index 329d4ad..0000000 --- a/app/src/main/java/xl/App.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ -package xl; - -public class App { - public String getGreeting() { - return "Hello World!"; - } - - public static void main(String[] args) { - System.out.println(new App().getGreeting()); - } -}