From 296458690cfe0edd56d2194fdaa5b174598e3067 Mon Sep 17 00:00:00 2001 From: Chiara Chiappini Date: Fri, 1 Nov 2024 09:43:55 +0000 Subject: [PATCH] remove unused dependencies --- Complications/Wearable/build.gradle | 2 +- WatchFaceKotlin/app/build.gradle | 2 +- WatchFaceKotlin/gradle/libs.versions.toml | 3 --- WearOAuth/gradle/libs.versions.toml | 23 ++++++++--------------- WearOAuth/oauth-device-grant/build.gradle | 2 +- WearOAuth/oauth-pkce/build.gradle | 2 +- WearOAuth/util/build.gradle | 1 - 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Complications/Wearable/build.gradle b/Complications/Wearable/build.gradle index d4a2b57c7..95bf4578c 100644 --- a/Complications/Wearable/build.gradle +++ b/Complications/Wearable/build.gradle @@ -21,7 +21,7 @@ plugins { } android { - compileSdk 34 + compileSdk 35 namespace "com.example.android.wearable.wear.complications" diff --git a/WatchFaceKotlin/app/build.gradle b/WatchFaceKotlin/app/build.gradle index 149dbdbeb..20afd70b4 100644 --- a/WatchFaceKotlin/app/build.gradle +++ b/WatchFaceKotlin/app/build.gradle @@ -20,7 +20,7 @@ plugins { } android { - compileSdk 34 + compileSdk 35 namespace "com.example.android.wearable.alpha" diff --git a/WatchFaceKotlin/gradle/libs.versions.toml b/WatchFaceKotlin/gradle/libs.versions.toml index 801a8f972..3005558e2 100644 --- a/WatchFaceKotlin/gradle/libs.versions.toml +++ b/WatchFaceKotlin/gradle/libs.versions.toml @@ -3,10 +3,7 @@ android-gradle-plugin = "8.7.1" androidx-activity = "1.9.3" androidx-lifecycle = "2.8.6" androidx-test = "1.4.0" -androidx-wear-compose = "1.1.0-rc01" -androidx-wear-tiles = "1.1.0" androidx-wear-watchface = "1.2.1" -compose = "1.5.0-beta01" ktlint = "0.50.0" org-jetbrains-kotlin = "1.9.25" org-jetbrains-kotlinx = "1.9.0" diff --git a/WearOAuth/gradle/libs.versions.toml b/WearOAuth/gradle/libs.versions.toml index 12d98a5d4..29eee96a1 100644 --- a/WearOAuth/gradle/libs.versions.toml +++ b/WearOAuth/gradle/libs.versions.toml @@ -1,19 +1,18 @@ [versions] android-gradle-plugin = "8.7.1" -androidx-compose-bom = "2024.10.00" +androidx-compose-bom = "2024.10.01" androidx-activity = "1.9.3" -androidx-lifecycle = "2.8.6" -androidx-test = "1.5.2" +androidx-lifecycle = "2.8.7" androidx-wear-compose = "1.4.0" -compose = "1.7.4" +compose = "1.7.5" compose-compiler = "1.5.15" -org-jetbrains-kotlin = "1.9.25" +kotlin = "2.0.21" org-jetbrains-kotlinx = "1.9.0" ktlint = "0.50.0" horologist = "0.6.20" robolectric = "4.13" roborazzi = "1.29.0" -ui-test-junit4 = "1.7.4" +ui-test-junit4 = "1.7.5" [libraries] android-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" } @@ -26,14 +25,8 @@ androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref androidx-appcompat = "androidx.appcompat:appcompat:1.7.0" androidx-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "androidx-wear-compose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" } -androidx-core-ktx = "androidx.core:core-ktx:1.13.1" androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.4" -androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" } -androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } -androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } -androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } -androidx-media = "androidx.media:media:1.7.0" androidx-wear = "androidx.wear:wear:1.3.0" androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest"} compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" } @@ -43,8 +36,8 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" horologist-compose-layout = { group = "com.google.android.horologist", name = "horologist-compose-layout", version.ref = "horologist" } horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" } junit = "junit:junit:4.13.2" -kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "org-jetbrains-kotlin" } -kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "org-jetbrains-kotlin" } +kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "org-jetbrains-kotlinx" } playservices-wearable = "com.google.android.gms:play-services-wearable:18.2.0" wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" } @@ -61,5 +54,5 @@ roborazzi-rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-ju com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } com-android-test = { id = "com.android.test", version.ref = "android-gradle-plugin" } com-diffplug-spotless = "com.diffplug.spotless:6.25.0" -org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" } diff --git a/WearOAuth/oauth-device-grant/build.gradle b/WearOAuth/oauth-device-grant/build.gradle index dd6382ea8..6495fa823 100644 --- a/WearOAuth/oauth-device-grant/build.gradle +++ b/WearOAuth/oauth-device-grant/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' alias libs.plugins.roborazzi + alias libs.plugins.compose.compiler } android { @@ -82,7 +83,6 @@ dependencies { // Standard android dependencies implementation projects.util implementation(libs.kotlin.stdlib) - implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.fragment.ktx) diff --git a/WearOAuth/oauth-pkce/build.gradle b/WearOAuth/oauth-pkce/build.gradle index f48930aab..43aea3130 100644 --- a/WearOAuth/oauth-pkce/build.gradle +++ b/WearOAuth/oauth-pkce/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' alias libs.plugins.roborazzi + alias libs.plugins.compose.compiler } android { @@ -84,7 +85,6 @@ dependencies { // Standard android dependencies implementation projects.util implementation(libs.kotlin.stdlib) - implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.fragment.ktx) diff --git a/WearOAuth/util/build.gradle b/WearOAuth/util/build.gradle index 1b444e466..43e76f9c0 100644 --- a/WearOAuth/util/build.gradle +++ b/WearOAuth/util/build.gradle @@ -49,6 +49,5 @@ android { } dependencies { - implementation(libs.androidx.core.ktx) implementation(libs.kotlinx.coroutines.android) }