From d972cebf4740e7349af7e056ac87a2b9ceb55dd5 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 24 Jan 2026 19:41:35 +0600 Subject: [PATCH] start update dependencies --- build.gradle | 5 +++++ dokka/build.gradle | 8 ++++---- github_release.gradle | 10 ++++++++-- gradle/libs.versions.toml | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- language_codes/generator/build.gradle | 4 +++- pagination/exposed/build.gradle | 2 +- .../dev/inmo/micro_utils/pagination/QueryExtensions.kt | 4 +++- 8 files changed, 30 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index ef380d4d69c..041969e91f3 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,11 @@ allprojects { maven { url "https://nexus.inmo.dev/repository/maven-releases/" } mavenLocal() } + + + it.tasks.withType(AbstractTestTask).configureEach { + it.failOnNoDiscoveredTests = false + } } apply from: "./extensions.gradle" diff --git a/dokka/build.gradle b/dokka/build.gradle index 86d156f90d3..e7e3d7a79e0 100644 --- a/dokka/build.gradle +++ b/dokka/build.gradle @@ -26,7 +26,7 @@ kotlin { project.parent.subprojects.forEach { if ( - it != project + it.name != project.name && it.hasProperty("kotlin") && it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("jsMain") } @@ -44,7 +44,7 @@ kotlin { project.parent.subprojects.forEach { if ( - it != project + it.name != project.name && it.hasProperty("kotlin") && it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("jsMain") } @@ -60,7 +60,7 @@ kotlin { project.parent.subprojects.forEach { if ( - it != project + it.name != project.name && it.hasProperty("kotlin") && it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } @@ -76,7 +76,7 @@ kotlin { project.parent.subprojects.forEach { if ( - it != project + it.name != project.name && it.hasProperty("kotlin") && it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("androidMain") } diff --git a/github_release.gradle b/github_release.gradle index 7a41aa72913..af5e2b6f59a 100644 --- a/github_release.gradle +++ b/github_release.gradle @@ -1,9 +1,15 @@ +interface InjectedExecOps { + @Inject //@javax.inject.Inject + ExecOperations getExecOps() +} private String getCurrentVersionChangelog() { 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', "${project.version}", 'CHANGELOG.md' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b24985cbd46..10b96d634b2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kt = "2.2.21" -kt-serialization = "1.9.0" +kt = "2.3.0" +kt-serialization = "1.10.0" kt-coroutines = "1.10.2" kotlinx-browser = "0.5.0" @@ -11,7 +11,7 @@ kslog = "1.5.2" jb-compose = "1.10.0" jb-compose-material3 = "1.10.0-alpha05" jb-compose-icons = "1.7.8" -jb-exposed = "0.61.0" +jb-exposed = "1.0.0" jb-dokka = "2.1.0" # 3.51.0.0 contains bug, checking with ./gradlew :micro_utils.repos.exposed:jvmTest @@ -20,7 +20,7 @@ sqlite = "3.50.1.0" korlibs = "5.4.0" uuid = "0.8.4" -ktor = "3.3.3" +ktor = "3.4.0" gh-release = "2.5.2" @@ -32,7 +32,7 @@ ksp = "2.3.4" kotlin-poet = "2.2.0" versions = "0.53.0" -nmcp = "1.2.0" +nmcp = "1.2.1" android-gradle = "8.12.+" dexcount = "4.0.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3ae1e2f124c..5dc98dbcf36 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/language_codes/generator/build.gradle b/language_codes/generator/build.gradle index cee60da0a9f..c49dd233e78 100644 --- a/language_codes/generator/build.gradle +++ b/language_codes/generator/build.gradle @@ -23,7 +23,9 @@ dependencies { implementation libs.ktor.client.java } -mainClassName="MainKt" +application { + mainClass = "MainKt" +} java { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/pagination/exposed/build.gradle b/pagination/exposed/build.gradle index dd919ba191e..aa1b8194a0c 100644 --- a/pagination/exposed/build.gradle +++ b/pagination/exposed/build.gradle @@ -14,7 +14,7 @@ kotlin { } jvmMain { dependencies { - api libs.jb.exposed + api libs.jb.exposed.jdbc } } } diff --git a/pagination/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/QueryExtensions.kt b/pagination/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/QueryExtensions.kt index f16fb6dcbcb..3965f694872 100644 --- a/pagination/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/QueryExtensions.kt +++ b/pagination/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/QueryExtensions.kt @@ -1,6 +1,8 @@ package dev.inmo.micro_utils.pagination -import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.v1.core.Expression +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.jdbc.Query fun Query.paginate(with: Pagination, orderBy: Pair, SortOrder>? = null) = limit(with.size)