Merge "Remove libs.kotlinStdlib dependencies from non-kotlin librarie…

…s" into androidx-main
dlam · Jul 20, 2023 · 6017108 · 6017108
2 parents 17320c7 + d812cd3
commit 6017108
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     // It can be removed if appcompat library is updated to a newer version
     implementation("androidx.vectordrawable:vectordrawable-animated:1.1.0")
 
-    androidTestImplementation(libs.kotlinStdlib)
     androidTestImplementation(libs.testExtJunit)
     androidTestImplementation(libs.testCore)
     androidTestImplementation(libs.testRunner)

diff --git a/wear/protolayout/protolayout-expression/build.gradle b/wear/protolayout/protolayout-expression/build.gradle
@@ -25,13 +25,10 @@ dependencies {
     annotationProcessor(libs.nullaway)
     api("androidx.annotation:annotation:1.2.0")
 
-    implementation("androidx.annotation:annotation-experimental:1.3.0")
+    implementation("androidx.annotation:annotation-experimental:1.3.1")
     implementation("androidx.collection:collection:1.2.0")
     implementation(project(path: ":wear:protolayout:protolayout-proto", configuration: "shadow"))
 
-    // Upgrade transitive kotlin-stdlib dependency from annotation-experimental.
-    implementation(libs.kotlinStdlib)
-
     testImplementation(libs.testExtJunit)
     testImplementation(libs.testExtTruth)
     testImplementation(libs.testRunner)

diff --git a/wear/watchface/watchface-complications-data-source-samples/build.gradle b/wear/watchface/watchface-complications-data-source-samples/build.gradle
@@ -22,7 +22,6 @@ plugins {
 dependencies {
     api(project(":wear:watchface:watchface-complications-data-source"))
     api(libs.guavaAndroid)
-    api(libs.kotlinStdlib)
     implementation("androidx.core:core:1.1.0")
     implementation("androidx.wear.protolayout:protolayout-expression:1.0.0-beta01")
 }

diff --git a/window/extensions/extensions/build.gradle b/window/extensions/extensions/build.gradle
@@ -23,9 +23,8 @@ plugins {
 }
 
 dependencies {
-    api(libs.kotlinStdlib)
     implementation("androidx.annotation:annotation:1.6.0")
-    implementation("androidx.annotation:annotation-experimental:1.1.0")
+    implementation("androidx.annotation:annotation-experimental:1.3.1")
     implementation("androidx.window.extensions.core:core:1.0.0")
 
     testImplementation(libs.robolectric)