Migrate to Gradle Kotlin DSL, fix fat JAR

This commit is contained in:
Daniel Wolf 2019-07-11 21:08:10 +02:00
parent b012c4f7f2
commit 3f55afa9a8
5 changed files with 50 additions and 50 deletions

View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.2)
add_custom_target(
rhubarbForSpine ALL
"./gradlew" "jar"
"./gradlew" "shadowJar"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMENT "Building Rhubarb for Spine through Gradle."
)

View File

@ -1,47 +0,0 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.3.41'
}
def getVersion() {
// Dynamically read version from CMake file
String text = new File('../../appInfo.cmake').getText('UTF-8')
String major = (text =~ /appVersionMajor\s+(\d+)/)[0][1]
String minor = (text =~ /appVersionMinor\s+(\d+)/)[0][1]
String patch = (text =~ /appVersionPatch\s+(\d+)/)[0][1]
String suffix = (text =~ /appVersionSuffix\s+"(.*?)"/)[0][1]
String result = "${major}.${minor}.${patch}${suffix}"
return result
}
group 'com.rhubarb_lip_sync'
version = getVersion()
repositories {
mavenCentral()
jcenter()
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation 'com.beust:klaxon:5.0.1'
implementation 'org.apache.commons:commons-lang3:3.9'
implementation 'no.tornado:tornadofx:1.7.19'
}
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
jar {
manifest {
attributes 'Main-Class': 'com.rhubarb_lip_sync.rhubarb_for_spine.MainKt'
}
// This line of code recursively collects and copies all of a project's files
// and adds them to the JAR itself. One can extend this task, to skip certain
// files or particular types at will
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
}

View File

@ -0,0 +1,48 @@
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 {
// Dynamically read version from CMake file
val file = File(rootDir.parentFile.parentFile, "appInfo.cmake")
val text = file.readText()
val major = Regex("""appVersionMajor\s+(\d+)""").find(text)!!.groupValues[1]
val minor = Regex("""appVersionMinor\s+(\d+)""").find(text)!!.groupValues[1]
val patch = Regex("""appVersionPatch\s+(\d+)""").find(text)!!.groupValues[1]
val suffix = Regex("""appVersionSuffix\s+"(.*?)"""").find(text)!!.groupValues[1]
return "$major.$minor.$patch$suffix"
}
group = "com.rhubarb_lip_sync"
version = getVersion()
repositories {
mavenCentral()
jcenter()
}
dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation("com.beust:klaxon:5.0.1")
implementation("org.apache.commons:commons-lang3:3.9")
implementation("no.tornado:tornadofx:1.7.19")
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
tasks.jar {
manifest {
attributes("Main-Class" to "com.rhubarb_lip_sync.rhubarb_for_spine.MainKt")
}
}
tasks.shadowJar {
archiveClassifier.set(null as String?)
}

View File

@ -1,2 +0,0 @@
rootProject.name = 'rhubarb-for-spine'

View File

@ -0,0 +1 @@
rootProject.name = "rhubarb-for-spine"