From e4355cbbda7fe92600e4742ffb722a0ff5d20fa8 Mon Sep 17 00:00:00 2001 From: Luke Wass Date: Wed, 28 May 2025 23:18:49 -0500 Subject: [PATCH] remove unused compose dependencies --- app/build.gradle.kts | 15 +++------------ build.gradle.kts | 1 - gradle/libs.versions.toml | 22 ++++------------------ 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4a37ab7..8c707a5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.kapt) alias(libs.plugins.kotlin.serialization) } @@ -14,8 +13,8 @@ android { applicationId = "de.jrpie.android.launcher" minSdk = 21 targetSdk = 35 - versionCode = 46 - versionName = "0.2.1" + versionCode = 47 + versionName = "0.2.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -67,7 +66,7 @@ android { } buildFeatures { buildConfig = true - compose = true + compose = false dataBinding = true viewBinding = true } @@ -84,14 +83,8 @@ android { dependencies { implementation(libs.androidx.activity) - implementation(libs.androidx.activity.compose) implementation(libs.androidx.activity.ktx) implementation(libs.androidx.appcompat) - implementation(platform(libs.androidx.compose.bom)) - implementation(libs.androidx.compose.material) - implementation(libs.androidx.compose.material3) - implementation(libs.androidx.compose.runtime) - implementation(libs.androidx.compose.ui.graphics) implementation(libs.androidx.constraintlayout) implementation(libs.androidx.core.ktx) implementation(libs.androidx.gridlayout) @@ -101,8 +94,6 @@ dependencies { implementation(libs.google.material) implementation(libs.kotlinx.serialization.json) implementation(libs.jonahbauer.android.preference.annotations) - implementation(libs.androidx.ui.tooling.preview.android) - debugImplementation(libs.androidx.ui.tooling) kapt(libs.jonahbauer.android.preference.annotations) testImplementation(libs.junit) androidTestImplementation(libs.androidx.espresso.core) diff --git a/build.gradle.kts b/build.gradle.kts index 842176e..7de5ddf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.kapt) apply false alias(libs.plugins.kotlin.serialization) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd00a27..2f4d019 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,40 +1,29 @@ [versions] activity = "1.10.1" activity-ktx = "1.10.1" -activityCompose = "1.10.1" -agp = "8.10.0" +agp = "8.10.1" android-preference-annotations = "1.1.2" appcompat = "1.7.0" -composeBom = "2025.05.00" -compose-latest = "1.8.1" constraintlayout = "2.2.1" core-ktx = "1.16.0" espresso-core = "3.6.1" gridlayout = "1.1.0" junit = "4.13.2" junitVersion = "1.2.1" -kapt = "1.8.10" -kotlin = "2.1.0" -kotlinx-serialization-json = "1.7.3" +kapt = "2.1.21" +kotlin = "2.1.20" +kotlinx-serialization-json = "1.8.1" material = "1.12.0" palette-ktx = "1.0.0" preference-ktx = "1.2.1" recyclerview = "1.4.0" serialization = "1.8.10" -uiTooling = "1.8.1" -uiToolingPreviewAndroid = "1.8.1" [libraries] # AndroidX dependencies androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity-ktx" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } -androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "compose-latest" } -androidx-compose-material3 = { module = "androidx.compose.material3:material3" } -androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } -androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" } androidx-gridlayout = { group = "androidx.gridlayout", name = "gridlayout", version.ref = "gridlayout" } @@ -55,12 +44,9 @@ jonahbauer-android-preference-annotations = { group = "eu.jonahbauer", name = "a junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" } -androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kapt" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization" } \ No newline at end of file