diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 37912dcf..a8451018 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -90,8 +90,6 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.compose) implementation(libs.androidx.foundation) implementation(libs.androidx.ui) - - //implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs"))) implementation(libs.androidx.appcompat) implementation(libs.androidx.constraintlayout) implementation(libs.kotlin.stdlib.jdk8) diff --git a/build.gradle b/build.gradle index 8fc84c64..b0e4e42c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,11 @@ buildscript { - ext.kotlin_version = '2.1.20' repositories { google() mavenCentral() } dependencies { - // noinspection AndroidGradlePluginVersion - classpath libs.gradle.v881 - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath libs.gradle + classpath libs.kotlin.gradle.plugin } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f630004b..1e48d91d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -47,9 +47,10 @@ androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefre androidx-ui = { module = "androidx.compose.ui:ui", version.ref = "ui" } androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" } -gradle-v881 = { module = "com.android.tools.build:gradle", version.ref = "gradleVersion" } +gradle = { module = "com.android.tools.build:gradle", version.ref = "gradleVersion" } kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinStdlibJdk8" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" } +kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } material = { module = "com.google.android.material:material", version.ref = "material" } ui-tooling = { module = "androidx.compose.ui:ui-tooling" } ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }