From 9f5717da7ce700ded5d877b64c245482d5cf35ad Mon Sep 17 00:00:00 2001 From: Ben Weiss Date: Thu, 30 Jul 2026 10:57:12 +0200 Subject: [PATCH 1/2] Sort all dependencies, remove unused ksp option --- ChatApp/app/build.gradle.kts | 28 +++----- ChatApp/gradle/libs.versions.toml | 74 +++++++++---------- ChatApp/shared/build.gradle.kts | 12 ++-- ChatApp/wear/build.gradle.kts | 24 +++---- agent/app/build.gradle.kts | 11 +-- agent/gradle/libs.versions.toml | 114 +++++++++++++++--------------- 6 files changed, 122 insertions(+), 141 deletions(-) diff --git a/ChatApp/app/build.gradle.kts b/ChatApp/app/build.gradle.kts index f6e7155..545ef06 100644 --- a/ChatApp/app/build.gradle.kts +++ b/ChatApp/app/build.gradle.kts @@ -64,38 +64,32 @@ android { } dependencies { - implementation(project(":shared")) - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.activity.compose) - implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.appfunctions) implementation(libs.androidx.compose.material.icons.core) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.hilt.navigation.compose) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.material3) implementation(libs.androidx.ui) implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) - implementation(libs.androidx.material3) implementation(libs.coil.compose) - - // Hilt implementation(libs.hilt.android.core) - implementation(libs.androidx.hilt.navigation.compose) - ksp(libs.hilt.compiler) - - // App functions - implementation(libs.androidx.appfunctions) + implementation(platform(libs.androidx.compose.bom)) + implementation(project(":shared")) ksp(libs.androidx.appfunctions.compiler) + ksp(libs.hilt.compiler) testImplementation(libs.junit) - androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.ui.test.junit4) androidTestImplementation(libs.hilt.android.testing) androidTestImplementation(libs.kotlinTest) androidTestImplementation(libs.truth) androidTestImplementation(platform(libs.androidx.compose.bom)) - androidTestImplementation(libs.androidx.ui.test.junit4) - debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.androidx.ui.test.manifest) + debugImplementation(libs.androidx.ui.tooling) } -// AppFunctions ksp option -ksp { arg("appfunctions:aggregateAppFunctions", "true") } diff --git a/ChatApp/gradle/libs.versions.toml b/ChatApp/gradle/libs.versions.toml index 82d99a5..bf9833b 100644 --- a/ChatApp/gradle/libs.versions.toml +++ b/ChatApp/gradle/libs.versions.toml @@ -1,71 +1,73 @@ [versions] +activityCompose = "1.13.0" agp = "9.3.1" +androidxHiltNavigationCompose = "1.4.0" appfunctions = "1.0.0-alpha10" -kotlin = "2.4.10" -coreKtx = "1.19.0" -junit = "4.13.2" -junitVersion = "1.3.0" -espressoCore = "3.7.0" -lifecycleRuntimeKtx = "2.11.0" -activityCompose = "1.13.0" +coil = "2.7.0" composeBom = "2026.06.01" composeMaterialIconsAndroid = "1.11.4" composeMaterialIconsCore = "1.7.8" +coreKtx = "1.19.0" +espressoCore = "3.7.0" hilt = "2.60.1" -androidxHiltNavigationCompose = "1.4.0" +junit = "4.13.2" +junitVersion = "1.3.0" +kotlin = "2.4.10" +kotlinxSerialization = "1.11.0" ksp = "2.3.10" -spotless = "8.8.0" +lifecycleRuntimeKtx = "2.11.0" +navigation3 = "1.1.4" truth = "1.4.5" -coil = "2.7.0" wearCompose = "1.6.2" wearComposeMaterial3 = "1.6.2" -navigation3 = "1.1.4" -kotlinxSerialization = "1.11.0" + #noinspection UnusedVersionCatalogEntry - Accessed dynamically ktlint = "1.2.1" +spotless = "8.8.0" [libraries] +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-appfunctions = { module = "androidx.appfunctions:appfunctions", version.ref = "appfunctions" } androidx-appfunctions-compiler = { module = "androidx.appfunctions:appfunctions-compiler", version.ref = "appfunctions" } -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -junit = { group = "junit", name = "junit", version.ref = "junit" } -androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } -androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } androidx-compose-material = { group = "androidx.compose.material", name = "material-android", version.ref = "composeMaterialIconsAndroid" } androidx-compose-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core", version.ref = "composeMaterialIconsCore" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-viewmodel-navigation3 = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-navigation3", version.ref = "lifecycleRuntimeKtx" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-navigation3-runtime = { group = "androidx.navigation3", name = "navigation3-runtime", version.ref = "navigation3" } +androidx-navigation3-ui = { group = "androidx.navigation3", name = "navigation3-ui", version.ref = "navigation3" } androidx-ui = { group = "androidx.compose.ui", name = "ui" } androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-material3 = { group = "androidx.compose.material3", name = "material3" } -hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } +androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "wearCompose" } +androidx-wear-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "wearCompose" } +androidx-wear-compose-material3 = { group = "androidx.wear.compose", name = "compose-material3", version.ref = "wearComposeMaterial3" } +androidx-wear-compose-navigation = { group = "androidx.wear.compose", name = "compose-navigation", version.ref = "wearCompose" } +coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } hilt-android-core = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" } -androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } +hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } +junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinTest = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" } -truth = { group = "com.google.truth", name = "truth", version.ref = "truth" } -coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } -androidx-wear-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "wearCompose" } -androidx-wear-compose-navigation = { group = "androidx.wear.compose", name = "compose-navigation", version.ref = "wearCompose" } -androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "wearCompose" } -androidx-wear-compose-material3 = { group = "androidx.wear.compose", name = "compose-material3", version.ref = "wearComposeMaterial3" } -androidx-navigation3-runtime = { group = "androidx.navigation3", name = "navigation3-runtime", version.ref = "navigation3" } -androidx-navigation3-ui = { group = "androidx.navigation3", name = "navigation3-ui", version.ref = "navigation3" } -androidx-lifecycle-viewmodel-navigation3 = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-navigation3", version.ref = "lifecycleRuntimeKtx" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } +truth = { group = "com.google.truth", name = "truth", version.ref = "truth" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } android-library = { id = "com.android.library", version.ref = "agp" } +appFunctions = { id = "appfunctions.aggregateAppFunctions" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -appFunctions = { id = "appfunctions.aggregateAppFunctions" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } + diff --git a/ChatApp/shared/build.gradle.kts b/ChatApp/shared/build.gradle.kts index 5a720e6..c026752 100644 --- a/ChatApp/shared/build.gradle.kts +++ b/ChatApp/shared/build.gradle.kts @@ -35,17 +35,13 @@ android { } dependencies { - implementation(platform(libs.androidx.compose.bom)) - implementation(libs.androidx.ui) - + implementation(libs.androidx.appfunctions) implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) - - // Hilt + implementation(libs.androidx.ui) implementation(libs.hilt.android.core) - ksp(libs.hilt.compiler) + implementation(platform(libs.androidx.compose.bom)) - // App functions - implementation(libs.androidx.appfunctions) ksp(libs.androidx.appfunctions.compiler) + ksp(libs.hilt.compiler) } diff --git a/ChatApp/wear/build.gradle.kts b/ChatApp/wear/build.gradle.kts index 4ff1d88..ab45797 100644 --- a/ChatApp/wear/build.gradle.kts +++ b/ChatApp/wear/build.gradle.kts @@ -59,27 +59,21 @@ android { } dependencies { - implementation(project(":shared")) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.appfunctions) implementation(libs.androidx.core.ktx) + implementation(libs.androidx.hilt.navigation.compose) implementation(libs.androidx.lifecycle.runtime.ktx) - implementation(libs.androidx.activity.compose) - - implementation(libs.androidx.wear.compose.material3) - implementation(libs.androidx.wear.compose.foundation) + implementation(libs.androidx.lifecycle.viewmodel.navigation3) implementation(libs.androidx.navigation3.runtime) implementation(libs.androidx.navigation3.ui) - implementation(libs.androidx.lifecycle.viewmodel.navigation3) - implementation(libs.kotlinx.serialization.json) - - // Hilt + implementation(libs.androidx.wear.compose.foundation) + implementation(libs.androidx.wear.compose.material3) implementation(libs.hilt.android.core) - implementation(libs.androidx.hilt.navigation.compose) - ksp(libs.hilt.compiler) + implementation(libs.kotlinx.serialization.json) + implementation(project(":shared")) - // App functions - implementation(libs.androidx.appfunctions) ksp(libs.androidx.appfunctions.compiler) + ksp(libs.hilt.compiler) } -// AppFunctions ksp option -ksp { arg("appfunctions:aggregateAppFunctions", "true") } diff --git a/agent/app/build.gradle.kts b/agent/app/build.gradle.kts index 08ef816..db83487 100644 --- a/agent/app/build.gradle.kts +++ b/agent/app/build.gradle.kts @@ -15,12 +15,12 @@ */ plugins { alias(libs.plugins.android.application) + alias(libs.plugins.hilt) alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.ksp) - alias(libs.plugins.hilt) - alias(libs.plugins.screenshot) alias(libs.plugins.oss.licenses) + alias(libs.plugins.screenshot) } android { @@ -105,10 +105,6 @@ android { } } -ksp { - arg("appfunctions:aggregateAppFunctions", "true") -} - dependencies { implementation(libs.androidx.activity.compose) implementation(libs.androidx.appcompat) @@ -122,8 +118,8 @@ dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.hilt.navigation.compose) - implementation(libs.androidx.lifecycle.viewmodel.compose) implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) implementation(libs.androidx.navigation.compose) implementation(libs.androidx.room.ktx) implementation(libs.androidx.room.runtime) @@ -145,7 +141,6 @@ dependencies { debugImplementation(libs.androidx.compose.ui.tooling) - // Testing androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.test.core) androidTestImplementation(libs.androidx.test.runner) diff --git a/agent/gradle/libs.versions.toml b/agent/gradle/libs.versions.toml index 94cc165..d491f87 100644 --- a/agent/gradle/libs.versions.toml +++ b/agent/gradle/libs.versions.toml @@ -1,97 +1,97 @@ [versions] +activityCompose = "1.13.0" agp = "9.3.1" -lifecycleViewmodelCompose = "2.11.0" -kotlin = "2.4.10" +androidxHiltNavigationCompose = "1.4.0" +androidxTestCore = "1.7.0" +appcompat = "1.7.1" +appfunctions = "1.0.0-alpha10" +coil = "2.7.0" +composeBom = "2026.06.01" coreKtx = "1.19.0" +coroutines = "1.11.0" +datastore = "1.2.1" +espressoCore = "3.7.0" +hilt = "2.60.1" junit = "4.13.2" junitVersion = "1.3.0" -espressoCore = "3.7.0" -appcompat = "1.7.1" +kotlin = "2.4.10" +kotlinxSerialization = "1.11.0" +ksp = "2.3.10" +ktor = "3.5.1" +lifecycleViewmodelCompose = "2.11.0" material = "1.14.0" -composeBom = "2026.06.01" material3 = "1.4.0" -activityCompose = "1.13.0" +mockk = "1.14.11" +multiplatformMarkdownRenderer = "0.43.0" navigationCompose = "2.9.8" +ossLicensesPlugin = "0.13.0" +playServicesOssLicenses = "17.5.1" robolectric = "4.16.1" -coroutines = "1.11.0" -androidxTestCore = "1.7.0" -spotless = "8.8.0" -mockk = "1.14.11" -ksp = "2.3.10" -hilt = "2.60.1" -androidxHiltNavigationCompose = "1.4.0" -appfunctions = "1.0.0-alpha10" -datastore = "1.2.1" -screenshot = "0.0.1-alpha15" -coil = "2.7.0" room = "2.8.4" -ktor = "3.5.1" -kotlinxSerialization = "1.11.0" -playServicesOssLicenses = "17.5.1" -ossLicensesPlugin = "0.13.0" -multiplatformMarkdownRenderer = "0.43.0" +screenshot = "0.0.1-alpha15" + #noinspection UnusedVersionCatalogEntry - Accessed dynamically ktlint = "1.2.1" +spotless = "8.8.0" [libraries] -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" } -androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleViewmodelCompose" } -junit = { group = "junit", name = "junit", version.ref = "junit" } -androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } -androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } +androidx-appfunctions = { group = "androidx.appfunctions", name = "appfunctions", version.ref = "appfunctions" } +androidx-appfunctions-compiler = { group = "androidx.appfunctions", name = "appfunctions-compiler", version.ref = "appfunctions" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-compose-ui-text-google-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts" } -androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } -androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-ui-text-google-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts" } +androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleViewmodelCompose" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } -robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } -kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } +androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } +androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" } androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestCore" } -mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } +coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" } -androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } -androidx-appfunctions = { group = "androidx.appfunctions", name = "appfunctions", version.ref = "appfunctions" } -androidx-appfunctions-compiler = { group = "androidx.appfunctions", name = "appfunctions-compiler", version.ref = "appfunctions" } -coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } -androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } -screenshot-validation-api = { group = "com.android.tools.screenshot", name = "screenshot-validation-api", version.ref = "screenshot" } -androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } -androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } -androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } +ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" } +ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" } ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" } +ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" } ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" } -ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" } ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" } -kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } -ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" } -ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" } -play-services-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "playServicesOssLicenses" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } multiplatform-markdown-renderer-m3 = { group = "com.mikepenz", name = "multiplatform-markdown-renderer-m3", version.ref = "multiplatformMarkdownRenderer" } +play-services-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "playServicesOssLicenses" } +robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } +screenshot-validation-api = { group = "com.android.tools.screenshot", name = "screenshot-validation-api", version.ref = "screenshot" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } +hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot" } -hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } oss-licenses = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "ossLicensesPlugin" } - +screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot" } +spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } From ed5459cfe46f6af900aba7b02f5842cf06366c78 Mon Sep 17 00:00:00 2001 From: Ben Weiss Date: Thu, 30 Jul 2026 11:49:53 +0200 Subject: [PATCH 2/2] spotlessApply --- ChatApp/app/build.gradle.kts | 1 - ChatApp/wear/build.gradle.kts | 1 - 2 files changed, 2 deletions(-) diff --git a/ChatApp/app/build.gradle.kts b/ChatApp/app/build.gradle.kts index 545ef06..e655918 100644 --- a/ChatApp/app/build.gradle.kts +++ b/ChatApp/app/build.gradle.kts @@ -92,4 +92,3 @@ dependencies { debugImplementation(libs.androidx.ui.test.manifest) debugImplementation(libs.androidx.ui.tooling) } - diff --git a/ChatApp/wear/build.gradle.kts b/ChatApp/wear/build.gradle.kts index ab45797..b52cf2d 100644 --- a/ChatApp/wear/build.gradle.kts +++ b/ChatApp/wear/build.gradle.kts @@ -76,4 +76,3 @@ dependencies { ksp(libs.androidx.appfunctions.compiler) ksp(libs.hilt.compiler) } -