From 6f7edd84beec5c760b890e37bfca89c69b5e8845 Mon Sep 17 00:00:00 2001 From: Shcherbatykh Oleg Date: Tue, 10 Feb 2026 14:30:16 +0300 Subject: [PATCH] fix gradle version --- app/build.gradle.kts | 14 ++++++-------- core/common/build.gradle.kts | 8 ++------ core/database/build.gradle.kts | 8 ++------ core/network/build.gradle.kts | 8 ++------ core/ui/build.gradle.kts | 8 ++------ feature/news/build.gradle.kts | 8 ++------ feature/progress/build.gradle.kts | 8 ++------ feature/schedule/build.gradle.kts | 8 ++------ gradle/libs.versions.toml | 14 +++++++++++++- gradle/wrapper/gradle-wrapper.properties | 5 ++--- 10 files changed, 35 insertions(+), 54 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 98b3192..f41d8c2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,18 +4,16 @@ plugins { android { namespace = "ru.fincode.tsudesk" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { applicationId = "ru.fincode.tsudesk" - minSdk = 24 - targetSdk = 36 - versionCode = 1 - versionName = "1.0" - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() + + versionCode = libs.versions.versionCode.get().toInt() + versionName = libs.versions.versionName.get() } buildTypes { diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 1467283..03e29c7 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -4,14 +4,10 @@ plugins { android { namespace = "ru.fincode.tsudesk.core.common" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") } diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index 2be4647..ced6753 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -4,14 +4,10 @@ plugins { android { namespace = "ru.fincode.tsudesk.core.database" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") } diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index 02b93e2..35b6f0a 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -4,14 +4,10 @@ plugins { android { namespace = "ru.fincode.tsudesk.core.network" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 86377a6..d6d5f3a 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -4,14 +4,10 @@ plugins { android { namespace = "ru.fincode.tsudesk.core.ui" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") } diff --git a/feature/news/build.gradle.kts b/feature/news/build.gradle.kts index 526a6e8..dedfc35 100644 --- a/feature/news/build.gradle.kts +++ b/feature/news/build.gradle.kts @@ -4,14 +4,10 @@ plugins { android { namespace = "ru.fincode.tsudesk.feature.news" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") } diff --git a/feature/progress/build.gradle.kts b/feature/progress/build.gradle.kts index c043dc3..b1876d4 100644 --- a/feature/progress/build.gradle.kts +++ b/feature/progress/build.gradle.kts @@ -4,14 +4,10 @@ plugins { android { namespace = "ru.fincode.tsudesk.feature.progress" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") } diff --git a/feature/schedule/build.gradle.kts b/feature/schedule/build.gradle.kts index 45b9d11..877cfb9 100644 --- a/feature/schedule/build.gradle.kts +++ b/feature/schedule/build.gradle.kts @@ -4,14 +4,10 @@ plugins { android { namespace = "ru.fincode.tsudesk.feature.schedule" - compileSdk { - version = release(36) - } + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + minSdk = libs.versions.minSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4c7591c..fbf47b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,20 @@ [versions] -agp = "9.0.0" +compileSdk = "36" +minSdk = "24" +targetSdk = "36" +versionName = "1.0" +versionCode = "1" + +agp = "8.8.2" coreKtx = "1.10.1" junit = "4.13.2" junitVersion = "1.1.5" espressoCore = "3.5.1" appcompat = "1.6.1" material = "1.10.0" +okhttp = "5.3.2" +activity = "1.8.0" +constraintlayout = "2.1.4" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -14,6 +23,9 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } +okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } +androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb136b6..cc482a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,7 @@ -#Tue Feb 10 11:39:05 MSK 2026 +#Tue Feb 10 13:51:09 MSK 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME