Migrate plugin definitions in version catalog

This commit is contained in:
Shinokuni 2024-07-06 17:04:09 +02:00
parent 5bf974eb0c
commit c011485819
5 changed files with 19 additions and 14 deletions

View File

@ -36,7 +36,7 @@ android {
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = "1.5.3" kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
} }
lint { lint {

View File

@ -5,22 +5,20 @@ import com.android.build.gradle.LibraryPlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
buildscript { buildscript {
val kotlin_version = "1.9.10"
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:8.1.4") classpath(libs.android.agp)
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") classpath(libs.kotlin.kgp)
classpath("org.jacoco:org.jacoco.core:0.8.7") classpath(libs.jacoco)
} }
} }
plugins { plugins {
id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false alias(libs.plugins.ksp) apply false
} }
allprojects { allprojects {
@ -31,11 +29,6 @@ allprojects {
mavenCentral() mavenCentral()
maven(url = "https://jitpack.io") maven(url = "https://jitpack.io")
} }
/*afterEvaluate {
tasks.withType(JavaCompile.class) {
options.compilerArgs << "-Xmaxerrs" << "1000"
}
}*/
} }
subprojects { subprojects {

View File

@ -1,5 +1,10 @@
[versions] [versions]
kotlin = "1.9.10"
ksp = "1.9.10-1.0.13"
android_agp = "8.1.4"
compose_compiler = "1.5.3"
compose_bom = "2024.02.02" compose_bom = "2024.02.02"
voyager = "1.0.0" voyager = "1.0.0"
lifecycle = "2.7.0" lifecycle = "2.7.0"
coil = "2.4.0" coil = "2.4.0"
@ -10,7 +15,14 @@ paging = "3.2.1"
okhttp = "4.11.0" okhttp = "4.11.0"
retrofit = "2.9.0" retrofit = "2.9.0"
[plugins]
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
[libraries] [libraries]
android-agp = { module = "com.android.tools.build:gradle", version.ref = "android_agp" }
kotlin-kgp = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
jacoco = "org.jacoco:org.jacoco.core:0.8.7"
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" } compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" }
compose-foundation = { module = "androidx.compose.foundation:foundation" } compose-foundation = { module = "androidx.compose.foundation:foundation" }
compose-runtime = { module = "androidx.compose.runtime:runtime" } compose-runtime = { module = "androidx.compose.runtime:runtime" }

View File

@ -1,2 +0,0 @@
include ':api', ':db'
include ':app'

2
settings.gradle.kts Normal file
View File

@ -0,0 +1,2 @@
include(":api", ":db", ":app")