From 640c0bd0906ba480da76af2015f2952c9bec5acd Mon Sep 17 00:00:00 2001 From: ansgarz Date: Tue, 22 Feb 2022 17:26:02 +0100 Subject: [PATCH] [skip ci] remove fatjars from build.gradle & update dependencies --- build.gradle | 70 ++++++---------------------------------------------- 1 file changed, 8 insertions(+), 62 deletions(-) diff --git a/build.gradle b/build.gradle index 28d03bf..b5148f6 100644 --- a/build.gradle +++ b/build.gradle @@ -68,59 +68,24 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1" - implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.1" + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2' + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2' implementation "org.jetbrains.kotlinx:kotlinx-cli:0.3.4" - implementation 'com.charleskorn.kaml:kaml:0.38.0' + implementation 'com.charleskorn.kaml:kaml:0.40.0' implementation group: 'com.hierynomus', name: 'sshj', version: '0.32.0' - api "org.slf4j:slf4j-api:1.7.32" - api "ch.qos.logback:logback-classic:1.2.9" - api "ch.qos.logback:logback-core:1.2.9" + api 'org.slf4j:slf4j-api:1.7.36' + api 'ch.qos.logback:logback-classic:1.2.10' + api 'ch.qos.logback:logback-core:1.2.10' testFixturesApi 'org.junit.jupiter:junit-jupiter-api:5.8.2' - testImplementation("io.mockk:mockk:1.12.1") + testImplementation('io.mockk:mockk:1.12.2') testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' } -// todo: for fatjars there is no need??? -//create a single Jar with all dependencies excl. Kotlin libs without version-number -task fatJarLatest(type: Jar) { - from { - configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } - } - exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA' - - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) - - manifest { - attributes 'Implementation-Title': 'Fatjar of provs', - 'Implementation-Version': project.version, - 'Main-Class': 'org.domaindrivenarchitecture.provs.desktop.application.CliWorkplaceKt' - } - with jar - archiveFileName = 'provs-desktop.jar' -} - -task fatJarK3s(type: Jar) { - from { - configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } - } - exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA' - - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) - - manifest { - attributes 'Implementation-Title': 'Fatjar of provs k3s', - 'Implementation-Version': project.version, - 'Main-Class': 'org.domaindrivenarchitecture.provs.server.application.ApplicationKt' - } - with jar - archiveFileName = 'provs-server.jar' -} task uberjarDesktop(type: Jar) { @@ -142,6 +107,7 @@ task uberjarDesktop(type: Jar) { archiveFileName = 'provs-desktop.jar' } + task uberjarServer(type: Jar) { from sourceSets.main.output @@ -162,26 +128,6 @@ task uberjarServer(type: Jar) { archiveFileName = 'provs-server.jar' } -task uberjarEntry(type: Jar) { - - from sourceSets.main.output - - dependsOn configurations.runtimeClasspath - from { - configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } - } { - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) - exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA' - } - - manifest { - attributes 'Implementation-Title': 'Gradle Jar File Example', - 'Implementation-Version': project.version, - 'Main-Class': 'org.domaindrivenarchitecture.provs.core.entry.EntryKt' - } - archiveFileName = 'provs-entry.jar' -} - task sourceJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource