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`.
This commit is contained in:
2025-06-25 09:33:26 +03:00
parent 76dd1e2ce7
commit 5be101deec
7 changed files with 12 additions and 18 deletions
+2 -2
View File
@@ -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 {
@@ -15,7 +15,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
extensions.configure<ApplicationExtension> {
configureKotlinAndroid(this)
defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
defaultConfig.targetSdk = 35
}
}
}
@@ -21,7 +21,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
extensions.configure<LibraryExtension> {
configureKotlinAndroid(this)
defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
defaultConfig.targetSdk = 35
defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
extensions.configure<LibraryAndroidComponentsExtension> {
@@ -15,7 +15,7 @@ class AndroidTestConventionPlugin : Plugin<Project> {
extensions.configure<TestExtension> {
configureKotlinAndroid(this)
defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
defaultConfig.targetSdk = 35
}
}
}
@@ -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 {
+4 -10
View File
@@ -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" }
+1 -1
View File
@@ -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