diff --git a/CHANGELOG.md b/CHANGELOG.md index 004c923..465e240 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ## 2.9.0 * `Version`: - * `Kotlin`: `2.3.20` + * `Kotlin`: `2.3.21` + * `Coroutines`: `1.11.0` * `Serialization`: `1.11.0` * `Dokka`: `2.2.0` * `AndroidXWork`: `2.11.2` diff --git a/dokka.gradle b/dokka.gradle index 6917352..831ece2 100644 --- a/dokka.gradle +++ b/dokka.gradle @@ -1,4 +1,4 @@ -dokkaHtml { +dokka { String dokkaOutputDirectoryPath = null switch (true) { case project.hasProperty("DOKKA_PATH"): @@ -32,7 +32,7 @@ dokkaHtml { sourceLink { localDirectory.set(file("./")) - remoteUrl.set(new URL("https://github.com/InsanusMokrassar/krontab/blob/master/")) + remoteUrl.set(new URI("https://github.com/InsanusMokrassar/krontab/blob/master/")) remoteLineSuffix.set("#L") } } diff --git a/github_release.gradle b/github_release.gradle index 0458a26..72bb14d 100644 --- a/github_release.gradle +++ b/github_release.gradle @@ -1,11 +1,17 @@ +interface InjectedExecOps { + @Inject //@javax.inject.Inject + ExecOperations getExecOps() +} private String getCurrentVersionChangelog(String version) { OutputStream changelogDataOS = new ByteArrayOutputStream() - exec { + + def injected = project.objects.newInstance(InjectedExecOps) + injected.execOps.exec { commandLine 'chmod', "+x", './changelog_parser.sh' } - exec { + injected.execOps.exec { standardOutput = changelogDataOS - commandLine './changelog_parser.sh', "$version", 'CHANGELOG.md' + commandLine './changelog_parser.sh', version, 'CHANGELOG.md' } return changelogDataOS.toString().trim() diff --git a/gradle.properties b/gradle.properties index 272ba6a..dd60140 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,15 +9,15 @@ android.useAndroidX=true android.enableJetifier=false -kotlin_version=2.3.20 -kotlin_coroutines_version=1.10.2 +kotlin_version=2.3.21 +kotlin_coroutines_version=1.11.0 kotlin_serialization_version=1.11.0 dokka_version=2.2.0 klockVersion=5.4.0 -nmcp_version=1.4.4 +nmcp_version=1.5.0 ## Github reease @@ -25,7 +25,7 @@ github_release_plugin_version=2.5.2 ## Android -android_gradle_version=8.12.+ +android_gradle_version=8.13.+ android_minSdkVersion=21 android_compileSdkVersion=36 android_buildToolsVersion=36.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 802e04b..df82445 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip