Compare commits

..

1 Commits

Author SHA1 Message Date
renovate[bot]
635c0c66f1 Update Gradle to v9 2026-03-05 12:31:47 +00:00
5 changed files with 38 additions and 63 deletions

View File

@@ -1,13 +1,5 @@
# Changelog # Changelog
## 2.9.0
* `Version`:
* `Kotlin`: `2.3.20`
* `Serialization`: `1.11.0`
* `Dokka`: `2.2.0`
* `AndroidXWork`: `2.11.2`
## 2.8.0 ## 2.8.0
* `Version`: * `Version`:

View File

@@ -19,7 +19,6 @@ plugins {
id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
id "org.jetbrains.dokka" version "$dokka_version" id "org.jetbrains.dokka" version "$dokka_version"
id "com.gradleup.nmcp.aggregation" version "$nmcp_version"
} }
// temporal crutch until legacy tests will be stabled or legacy target will be removed // temporal crutch until legacy tests will be stabled or legacy target will be removed
@@ -41,20 +40,6 @@ project.group = "dev.inmo"
apply from: "publish.gradle" apply from: "publish.gradle"
apply from: "github_release.gradle" apply from: "github_release.gradle"
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
nmcpAggregation {
centralPortal {
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
validationTimeout = Duration.ofHours(4)
publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
}
publishAllProjectsProbablyBreakingProjectIsolation()
}
}
repositories { repositories {
mavenLocal() mavenLocal()
// jcenter() // jcenter()

View File

@@ -9,16 +9,14 @@ android.useAndroidX=true
android.enableJetifier=false android.enableJetifier=false
kotlin_version=2.3.20 kotlin_version=2.3.10
kotlin_coroutines_version=1.10.2 kotlin_coroutines_version=1.10.2
kotlin_serialization_version=1.11.0 kotlin_serialization_version=1.10.0
dokka_version=2.2.0 dokka_version=2.1.0
klockVersion=5.4.0 klockVersion=5.4.0
nmcp_version=1.4.4
## Github reease ## Github reease
github_release_plugin_version=2.5.2 github_release_plugin_version=2.5.2
@@ -34,9 +32,9 @@ junit_version=4.13.2
test_ext_junit_version=1.3.0 test_ext_junit_version=1.3.0
espresso_core=3.7.0 espresso_core=3.7.0
androidx_work_version=2.11.2 androidx_work_version=2.11.1
## Common ## Common
version=2.9.0 version=2.8.0
android_code_version=50 android_code_version=49

View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip

View File

@@ -37,42 +37,42 @@ publishing {
} }
} }
} repositories {
repositories { if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { maven {
maven { name = "GithubPackages"
name = "GithubPackages" url = uri("https://maven.pkg.github.com/InsanusMokrassar/krontab")
url = uri("https://maven.pkg.github.com/InsanusMokrassar/krontab")
credentials {
credentials { username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') }
} }
} }
} if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) { maven {
maven { name = "InmoNexus"
name = "InmoNexus" url = uri("https://nexus.inmo.dev/repository/maven-releases/")
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
credentials {
credentials { username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER') password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') }
} }
} }
} if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { maven {
maven { name = "sonatype"
name = "sonatype" url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
credentials {
credentials { username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') }
} }
} }
} }
} }