Remove duplicate -ktx constraints on atomic groups

alanv · alanv · commit 63c50eecebee · 2023-03-20T19:27:59.000Z
Bug: 274467307
Test: manual pending enforcement in b/274465172
Change-Id: I7fc65ccbda3f261f698a3ccab4a7884404dcc41b
diff --git a/appcompat/appcompat-resources/build.gradle b/appcompat/appcompat-resources/build.gradle
@@ -23,11 +23,6 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":appcompat:appcompat"))
-    }
-
     api("androidx.annotation:annotation:1.2.0")
     api("androidx.core:core:1.6.0")
     implementation("androidx.collection:collection:1.0.0")
diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle
@@ -8,11 +8,6 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":appcompat:appcompat-resources"))
-    }
-
     api("androidx.annotation:annotation:1.3.0")
     api("androidx.core:core:1.9.0")
 
diff --git a/biometric/biometric-ktx/build.gradle b/biometric/biometric-ktx/build.gradle
@@ -23,11 +23,6 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":biometric:biometric-ktx"))
-    }
-
     api(libs.kotlinStdlib)
     api(libs.kotlinCoroutinesCore)
     api(project(":biometric:biometric"))
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle
@@ -28,11 +28,6 @@ android {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":biometric:biometric-ktx"))
-    }
-
     // Public API dependencies
     api("androidx.annotation:annotation:1.1.0")
     api("androidx.core:core:1.3.2")
diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
+    // Atomically versioned.
     constraints {
         implementation(project(":core:core"))
     }
diff --git a/core/core/build.gradle b/core/core/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
+    // Atomically versioned.
     constraints {
         implementation(project(":core:core-ktx"))
     }
diff --git a/palette/palette-ktx/build.gradle b/palette/palette-ktx/build.gradle
@@ -23,11 +23,6 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":palette:palette"))
-    }
-
     api(project(":palette:palette"))
     api(libs.kotlinStdlib)
     androidTestImplementation(libs.junit)
diff --git a/palette/palette/build.gradle b/palette/palette/build.gradle
@@ -6,11 +6,6 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":palette:palette-ktx"))
-    }
-
     api("androidx.core:core:1.1.0")
     implementation("androidx.collection:collection:1.1.0")
 
diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle
@@ -23,11 +23,6 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":preference:preference"))
-    }
-
     api(project(":preference:preference"))
     api("androidx.core:core-ktx:1.1.0") {
         because "Mirror preference dependency graph for -ktx artifacts"
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle
@@ -23,11 +23,6 @@ plugins {
 }
 
 dependencies {
-    // Atomic group
-    constraints {
-        implementation(project(":preference:preference-ktx"))
-    }
-
     api("androidx.annotation:annotation:1.2.0")
     api("androidx.appcompat:appcompat:1.1.0")
     // Use the latest version of core library for verifying insets visibility
diff --git a/savedstate/savedstate-ktx/build.gradle b/savedstate/savedstate-ktx/build.gradle
@@ -23,7 +23,6 @@ plugins {
 }
 
 dependencies {
-
     api(project(":savedstate:savedstate"))
     api(libs.kotlinStdlib)
 
diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle
@@ -14,7 +14,6 @@ android {
 }
 
 dependencies {
-
     api("androidx.annotation:annotation:1.1.0")
     implementation("androidx.arch.core:core-common:2.1.0")
     implementation("androidx.lifecycle:lifecycle-common:2.6.1")

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- // Atomic group`
	`10`	`+ // Atomically versioned.`
`11`	`11`	`constraints {`
`12`	`12`	`implementation(project(":core:core"))`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- // Atomic group`
	`11`	`+ // Atomically versioned.`
`12`	`12`	`constraints {`
`13`	`13`	`implementation(project(":core:core-ktx"))`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ plugins {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`dependencies {`
`26`		`-`
`27`	`26`	`api(project(":savedstate:savedstate"))`
`28`	`27`	`api(libs.kotlinStdlib)`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ android {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`dependencies {`
`17`		`-`
`18`	`17`	`api("androidx.annotation:annotation:1.1.0")`
`19`	`18`	`implementation("androidx.arch.core:core-common:2.1.0")`
`20`	`19`	`implementation("androidx.lifecycle:lifecycle-common:2.6.1")`