From 879d2ded3b2e403347819af95315ecfbe78a1b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=BA=D0=BE=D0=B2=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD?= Date: Thu, 16 Apr 2026 19:59:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=D1=81=D0=B5=20=D0=BB=D0=B8=D0=B1=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 11 ++++--- data/build.gradle.kts | 10 +++--- gradle/gradle-daemon-jvm.properties | 1 - gradle/libs.versions.toml | 42 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- presentation/build.gradle.kts | 8 ++--- 6 files changed, 36 insertions(+), 38 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 31cef83..7b51bb4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.compose.compiler) alias(libs.plugins.dagger.hilt) alias(libs.plugins.ksp) @@ -8,7 +7,7 @@ plugins { android { namespace = "com.github.nullptroma.wallenc.app" - compileSdk = 35 + compileSdk = 37 defaultConfig { applicationId = "com.github.nullptroma.wallenc.app" @@ -38,9 +37,7 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } + buildFeatures { compose = true } @@ -52,6 +49,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { // Timber implementation(libs.timber) diff --git a/data/build.gradle.kts b/data/build.gradle.kts index a8257d0..23fe7b2 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -1,12 +1,11 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) } android { namespace = "com.github.nullptroma.wallenc.data" - compileSdk = 35 + compileSdk = 37 defaultConfig { minSdk = 26 @@ -28,9 +27,10 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } +} + +kotlin { + jvmToolchain(17) } dependencies { diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 382c699..63e5bbd 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,3 +1,2 @@ #This file is generated by updateDaemonJvm -toolchainVendor=jetbrains toolchainVersion=21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8aa3e6b..7610559 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] -agp = "8.13.2" -jacksonModuleKotlin = "2.18.2" -kotlin = "2.0.20" -coreKtx = "1.15.0" +agp = "9.1.1" +jacksonModuleKotlin = "2.21.2" +kotlin = "2.3.20" +coreKtx = "1.18.0" junit = "4.13.2" -junitVersion = "1.2.1" -espressoCore = "3.6.1" -kotlinReflect = "2.0.21" -kotlinxCoroutinesCore = "1.9.0" -kotlinxSerializationJson = "1.7.3" -lifecycleRuntimeKtx = "2.8.7" -activityCompose = "1.10.0" -composeBom = "2025.01.00" -navigation = "2.8.5" -hiltNavigation = "1.2.0" +junitVersion = "1.3.0" +espressoCore = "3.7.0" +kotlinReflect = "2.2.21" +kotlinxCoroutinesCore = "1.10.2" +kotlinxSerializationJson = "1.11.0" +lifecycleRuntimeKtx = "2.10.0" +activityCompose = "1.13.0" +composeBom = "2026.03.01" +navigation = "2.9.7" +hiltNavigation = "1.3.0" timber = "5.0.1" -yandexAuthSdk = "3.1.2" -daggerHilt = "2.52" -ksp = "2.0.20-1.0.25" -room = "2.6.1" -retrofit = "2.11.0" -appcompat = "1.7.0" -material = "1.12.0" +yandexAuthSdk = "3.2.0" +daggerHilt = "2.59.2" +ksp = "2.3.6" +room = "2.8.4" +retrofit = "3.0.0" +appcompat = "1.7.1" +material = "1.13.0" [libraries] jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2288159..ed4de6a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Sep 07 01:04:14 MSK 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 8387a3c..4e3da1b 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.compose.compiler) alias(libs.plugins.dagger.hilt) alias(libs.plugins.jetbrains.kotlin.serialization) @@ -10,7 +9,7 @@ plugins { android { namespace = "com.github.nullptroma.wallenc.presentation" - compileSdk = 34 + compileSdk = 37 defaultConfig { minSdk = 24 @@ -32,9 +31,7 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } + buildFeatures { compose = true } @@ -46,6 +43,7 @@ android { } } + dependencies { implementation(libs.navigation) implementation(libs.navigation.hilt.compose)