diff --git a/build.gradle b/build.gradle index 6ba11ea..83734d1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = "1.7.0" + ext.kotlin_version = "1.7.20" ext.CI_PROJECT_ID = System.env.CI_PROJECT_ID repositories { @@ -26,6 +26,10 @@ repositories { java { + // https://stackoverflow.com/questions/21904269/configure-gradle-to-publish-sources-and-javadoc + withSourcesJar() + withJavadocJar() + toolchain { languageVersion = JavaLanguageVersion.of(11) } @@ -61,12 +65,6 @@ compileJava.options.debugOptions.debugLevel = "source,lines,vars" compileTestFixturesJava.options.debugOptions.debugLevel = "source,lines,vars" compileTestJava.options.debugOptions.debugLevel = "source,lines,vars" -// https://stackoverflow.com/questions/21904269/configure-gradle-to-publish-sources-and-javadoc -java { - withSourcesJar() - withJavadocJar() -} - dependencies { @@ -75,7 +73,7 @@ dependencies { api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2") api("org.jetbrains.kotlinx:kotlinx-cli:0.3.4") - api('com.charleskorn.kaml:kaml:0.49.0') + api('com.charleskorn.kaml:kaml:0.54.0') api("org.slf4j:slf4j-api:1.7.36") api('ch.qos.logback:logback-classic:1.2.11') @@ -93,7 +91,7 @@ dependencies { } -task uberjarDesktop(type: Jar) { +tasks.register('uberjarDesktop', Jar) { from sourceSets.main.output @@ -114,7 +112,7 @@ task uberjarDesktop(type: Jar) { } -task uberjarServer(type: Jar) { +tasks.register('uberjarServer', Jar) { from sourceSets.main.output @@ -135,7 +133,7 @@ task uberjarServer(type: Jar) { } -task uberjarSyspec(type: Jar) { +tasks.register('uberjarSyspec', Jar) { from sourceSets.main.output @@ -159,7 +157,7 @@ def projectRoot = rootProject.projectDir // copy jar to /usr/local/bin and make it executable // Remark: to be able to use it you must have jarwrapper installed (sudo apt install jarwrapper) -task installlocally { +tasks.register('installlocally') { dependsOn(uberjarServer, uberjarDesktop, uberjarSyspec) doLast { exec { commandLine("sh", "-c", "sudo apt-get update & sudo apt-get install jarwrapper") } @@ -172,11 +170,6 @@ task installlocally { } } -task sourceJar(type: Jar, dependsOn: classes) { - from sourceSets.main.allSource - archiveClassifier.set("sources") -} - // publish to repo.prod.meissa.de with task "publishLibraryPublicationToMeissaRepository" -- (using pattern "publishLibraryPublicationToRepository") publishing {