From 5be101deecadcd3fff6e23cfd4a99571b36cd368 Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Wed, 25 Jun 2025 09:33:26 +0300 Subject: [PATCH] Refactor: Move versioning to build files, update dependencies This commit moves the `minSdk`, `targetSdk`, `compileSdk`, `versionCode`, and `versionName` definitions from `gradle/libs.versions.toml` directly into the relevant build files (`app/build.gradle.kts` and convention plugins). Additionally, the following dependencies were updated: - Gradle wrapper from 8.12 to 8.14.2 - KSP from 2.1.21-2.0.2 to 2.2.0-2.0.2 - ModuleGraph from 2.8.0 to 2.9.0 The `fast-android-test` and `fast-jvm-library` plugin aliases were also commented out in `gradle/libs.versions.toml`. --- app/build.gradle.kts | 4 ++-- .../kotlin/AndroidApplicationConventionPlugin.kt | 2 +- .../main/kotlin/AndroidLibraryConventionPlugin.kt | 2 +- .../src/main/kotlin/AndroidTestConventionPlugin.kt | 2 +- .../main/kotlin/dev/meloda/fast/KotlinAndroid.kt | 4 ++-- gradle/libs.versions.toml | 14 ++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 72ffe0c6..e9daefec 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ android { defaultConfig { applicationId = "dev.meloda.fastvk" - versionCode = libs.versions.versionCode.get().toInt() - versionName = libs.versions.versionName.get() + versionCode = 10 + versionName = "0.2.2" } signingConfigs { diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 62a7b7fb..550ef857 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -15,7 +15,7 @@ class AndroidApplicationConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) - defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt() + defaultConfig.targetSdk = 35 } } } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 5d6e3c27..1253ae50 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -21,7 +21,7 @@ class AndroidLibraryConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) - defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt() + defaultConfig.targetSdk = 35 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } extensions.configure { diff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt index d032c87c..8c16776c 100644 --- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt @@ -15,7 +15,7 @@ class AndroidTestConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) - defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt() + defaultConfig.targetSdk = 35 } } } diff --git a/build-logic/convention/src/main/kotlin/dev/meloda/fast/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/dev/meloda/fast/KotlinAndroid.kt index d1238e06..9200fa82 100644 --- a/build-logic/convention/src/main/kotlin/dev/meloda/fast/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/dev/meloda/fast/KotlinAndroid.kt @@ -16,10 +16,10 @@ internal fun Project.configureKotlinAndroid( commonExtension: CommonExtension<*, *, *, *, *, *>, ) { commonExtension.apply { - compileSdk = libs.findVersion("compileSdk").get().toString().toInt() + compileSdk = 35 defaultConfig { - minSdk = libs.findVersion("minSdk").get().toString().toInt() + minSdk = 23 } compileOptions { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f65f4ba..21975187 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,10 @@ [versions] -minSdk = "23" -targetSdk = "35" -compileSdk = "35" -versionCode = "10" -versionName = "0.2.2" - agp = "8.10.1" retrofit = "3.0.0" eithernet = "2.0.0" haze = "1.6.4" kotlin = "2.2.0" -ksp = "2.1.21-2.0.2" +ksp = "2.2.0-2.0.2" compose-bom = "2025.06.00" koin = "4.1.0" @@ -31,7 +25,7 @@ preference-ktx = "1.2.1" nanokt = "1.2.0" androidx-navigation = "2.9.0" serialization = "1.8.1" -moduleGraph = "2.8.0" +moduleGraph = "2.9.0" [libraries] accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } @@ -132,5 +126,5 @@ fast-android-feature = { id = "fast.android.feature", version = "unspecified" } fast-android-library = { id = "fast.android.library", version = "unspecified" } fast-android-library-compose = { id = "fast.android.library.compose", version = "unspecified" } fast-android-room = { id = "fast.android.room", version = "unspecified" } -fast-android-test = { id = "fast.android.test", version = "unspecified" } -fast-jvm-library = { id = "fast.jvm.library", version = "unspecified" } +#fast-android-test = { id = "fast.android.test", version = "unspecified" } +#fast-jvm-library = { id = "fast.jvm.library", version = "unspecified" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..ff23a68d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME