From 716627795acfadbef3bda66cf4005d7c59b90dde Mon Sep 17 00:00:00 2001 From: D4rK7355608 Date: Wed, 17 Jul 2024 20:03:17 +0300 Subject: [PATCH] Fixed the app build project --- app/build.gradle.kts | 7 +------ app/proguard-rules.pro | 4 +++- build.gradle.kts | 1 - gradle/libs.versions.toml | 12 ++++-------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 35a8005..0c92e57 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,6 @@ plugins { alias(libs.plugins.googleOssServices) alias(libs.plugins.googleFirebase) alias(libs.plugins.compose.compiler) - alias(libs.plugins.devToolsKsp) } android { @@ -138,11 +137,6 @@ dependencies { implementation(libs.androidx.media3.ui) implementation(libs.androidx.media3.session) - // KSP - ksp(libs.androidx.room.compiler) - implementation(libs.androidx.room.ktx) - implementation(libs.androidx.room.runtime) - // Kotlin implementation(libs.kotlinx.coroutines.android) implementation(libs.ktor.client.core) @@ -153,6 +147,7 @@ dependencies { // Other implementation(libs.lottie.compose) implementation(libs.coil.compose) + implementation(libs.slf4j.simple) // Test testImplementation(libs.junit) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index a2414d6..615843b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -31,4 +31,6 @@ public *; } --keep class ch.qos.logback.** { *; } \ No newline at end of file +-keep class ch.qos.logback.** { +public *; +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index a269733..cb98ceb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,5 +8,4 @@ plugins { alias(libs.plugins.googlePlayServices) apply false alias(libs.plugins.googleFirebase) apply false alias(libs.plugins.googleOssServices) apply false - alias(libs.plugins.devToolsKsp) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 02a0904..ab876af 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,15 +9,16 @@ billing = "7.0.0" datastoreCore = "1.1.1" graphicsShapes = "1.0.0-beta01" ktorClientContentNegotiation = "2.3.12" -ktorClientCio = "2.3.4" +ktorClientCio = "2.3.12" ktorClientCore = "2.3.12" ktorSerializationKotlinxJson = "2.3.12" lifecycle = "2.8.3" -lottieCompose = "4.0.0" +lottieCompose = "6.4.1" material = "1.12.0" kotlinxCoroutinesAndroid = "1.8.1" media3Exoplayer = "1.3.1" multidex = "2.0.1" +slf4jSimple = "2.0.13" volley = "1.2.1" workRuntimeKtx = "2.9.0" coreSplashscreen = "1.0.1" @@ -33,8 +34,6 @@ composeUi = "1.6.8" google-services = "4.4.2" google-oss-services = "0.10.6" google-firebase-crashlytics = "3.0.2" -google-devtools-ksp = "2.0.0-1.0.23" -roomKtx = "2.6.1" playServicesAds = "23.2.0" playServicesOssLicenses = "17.1.0" reviewKtx = "2.0.1" @@ -65,9 +64,6 @@ androidx-material3 = { module = "androidx.compose.material3:material3" } androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" } androidx-runtime = { module = "androidx.compose.runtime:runtime" } androidx-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } -androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomKtx" } -androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomKtx" } -androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomKtx" } androidx-ui = { module = "androidx.compose.ui:ui" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" } @@ -91,6 +87,7 @@ material = { module = "com.google.android.material:material", version.ref = "mat play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "playServicesAds" } play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" } review-ktx = { module = "com.google.android.play:review-ktx", version.ref = "reviewKtx" } +slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4jSimple" } ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeUi" } ui-tooling = { module = "androidx.compose.ui:ui-tooling" } volley = { module = "com.android.volley:volley", version.ref = "volley" } @@ -103,6 +100,5 @@ jetbrainsKotlinParcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", versi googlePlayServices = { id = "com.google.gms.google-services", version.ref = "google-services" } googleOssServices = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "google-oss-services" } googleFirebase = { id = "com.google.firebase.crashlytics", version.ref = "google-firebase-crashlytics" } -devToolsKsp = { id = "com.google.devtools.ksp", version.ref = "google-devtools-ksp" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } \ No newline at end of file