From 2f6e8bc549766b40b312fb245e077050a8065bb7 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Sun, 21 Jul 2019 10:26:41 +0200 Subject: [PATCH] Simplify Gradle build --- extras/EsotericSoftwareSpine/CMakeLists.txt | 2 +- extras/EsotericSoftwareSpine/build.gradle.kts | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/extras/EsotericSoftwareSpine/CMakeLists.txt b/extras/EsotericSoftwareSpine/CMakeLists.txt index c341cdd..2c32021 100644 --- a/extras/EsotericSoftwareSpine/CMakeLists.txt +++ b/extras/EsotericSoftwareSpine/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.2) add_custom_target( rhubarbForSpine ALL - "./gradlew" "shadowJar" + "./gradlew" "build" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMENT "Building Rhubarb for Spine through Gradle." ) diff --git a/extras/EsotericSoftwareSpine/build.gradle.kts b/extras/EsotericSoftwareSpine/build.gradle.kts index 97a95f1..64dda69 100644 --- a/extras/EsotericSoftwareSpine/build.gradle.kts +++ b/extras/EsotericSoftwareSpine/build.gradle.kts @@ -1,10 +1,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.File -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { kotlin("jvm") version "1.3.41" - id("com.github.johnrengelman.shadow") version "5.1.0" } fun getVersion(): String { @@ -43,13 +41,10 @@ tasks.test { useJUnitPlatform() } -tasks.shadowJar { - dependsOn(tasks.test) - - // Modified by shadow plugin - archiveClassifier.set(null as String?) - +tasks.withType { manifest { attributes("Main-Class" to "com.rhubarb_lip_sync.rhubarb_for_spine.MainKt") } + + from(configurations.compileClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) }