Skip to content

Commit a75e3d6

Browse files
alanvalanv
committed
Refactor project paths to match Maven coordinates
Doesn't move sample projects that ship to Maven as artifacts, which technically violate the guideline but warrant further discussion. Bug: 191911288 Test: ./gradlew tasks Merged-In: I1b2c3295c05791ccba66290e58bc1e66f3aecfc0 Change-Id: I1b2c3295c05791ccba66290e58bc1e66f3aecfc0
1 parent 3c206d5 commit a75e3d6

File tree

600 files changed

+105
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+105
-108
lines changed

‎ads/ads-identifier-benchmark/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ plugins {
2222

2323
dependencies {
2424
androidTestImplementation(project(":benchmark:benchmark-junit4"))
25-
androidTestImplementation(project(":ads-identifier-common"))
26-
androidTestImplementation(project(":ads-identifier"))
27-
androidTestImplementation(project(":ads-identifier-provider"))
28-
androidTestImplementation(project(":ads-identifier-testing"))
25+
androidTestImplementation(project(":ads:ads-identifier-common"))
26+
androidTestImplementation(project(":ads:ads-identifier"))
27+
androidTestImplementation(project(":ads:ads-identifier-provider"))
28+
androidTestImplementation(project(":ads:ads-identifier-testing"))
2929
androidTestImplementation("androidx.work:work-runtime:2.2.0")
3030
androidTestImplementation(libs.junit)
3131
androidTestImplementation(libs.truth)

‎ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
<!-- Important: disable debuggable for accurate performance results -->
2323
<application
2424
android:name=".AdsIdentifierBenchmarkApplication"
25-
android:debuggable="false"
26-
tools:replace="android:debuggable">
25+
android:debuggable="false">
2726
<!-- enable profileableByShell for non-intrusive profiling tools -->
2827
<!--suppress AndroidElementNotAllowed -->
2928
<profileable android:shell="true"/>

‎ads/ads-identifier-common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ plugins {
2626
dependencies {
2727
api("androidx.annotation:annotation:1.1.0")
2828

29-
testImplementation(project(":ads-identifier-testing"))
29+
testImplementation(project(":ads:ads-identifier-testing"))
3030
testImplementation(libs.testRunner)
3131
testImplementation(libs.junit)
3232
testImplementation(libs.truth)

‎ads/ads-identifier-provider/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ dependencies {
2929
implementation(libs.autoValueAnnotations)
3030
annotationProcessor(libs.autoValue)
3131

32-
implementation(project(":ads-identifier-common"))
32+
implementation(project(":ads:ads-identifier-common"))
3333

34-
androidTestImplementation(project(":ads-identifier-testing"))
34+
androidTestImplementation(project(":ads:ads-identifier-testing"))
3535
androidTestImplementation(libs.junit)
3636
androidTestImplementation(libs.truth)
3737
androidTestImplementation(libs.testExtJunit)

‎ads/ads-identifier-provider/integration-tests/testapp/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
}
2727

2828
dependencies {
29-
implementation(project(":ads-identifier-provider"))
29+
implementation(project(":ads:ads-identifier-provider"))
3030
implementation("androidx.recyclerview:recyclerview:1.0.0")
3131
api("androidx.annotation:annotation:1.1.0")
3232
}

‎ads/ads-identifier-testing/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
}
2020

2121
dependencies {
22-
implementation(project(":ads-identifier-common"))
22+
implementation(project(":ads:ads-identifier-common"))
2323
api("androidx.annotation:annotation:1.1.0")
2424
api(libs.mockitoCore, excludes.bytebuddy)
2525
}

‎ads/ads-identifier/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ dependencies {
3131
api(libs.guavaListenableFuture)
3232
implementation("androidx.concurrent:concurrent-futures:1.0.0")
3333

34-
implementation(project(":ads-identifier-common"))
34+
implementation(project(":ads:ads-identifier-common"))
3535

36-
androidTestImplementation(project(":ads-identifier-testing"))
36+
androidTestImplementation(project(":ads:ads-identifier-testing"))
3737
androidTestImplementation(libs.junit)
3838
androidTestImplementation(libs.truth)
3939
androidTestImplementation(libs.testExtJunit)

‎ads/ads-identifier/integration-tests/testapp/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
}
2828

2929
dependencies {
30-
implementation(project(":ads-identifier"))
31-
implementation(project(":ads-identifier-common"))
30+
implementation(project(":ads:ads-identifier"))
31+
implementation(project(":ads:ads-identifier-common"))
3232
implementation(libs.guavaAndroid)
3333
}

‎buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ abstract class AndroidXRootPlugin : Plugin<Project> {
143143
}
144144

145145
if (partiallyDejetifyArchiveTask != null) {
146-
project(":jetifier-standalone").afterEvaluate { standAloneProject ->
146+
project(":jetifier:jetifier-standalone").afterEvaluate { standAloneProject ->
147147
partiallyDejetifyArchiveTask.configure {
148148
it.dependsOn(standAloneProject.tasks.named("installDist"))
149149
}

‎buildSrc/src/main/kotlin/androidx/build/BuildOnServer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ open class BuildOnServer : DefaultTask() {
6161
filesNames.add("dokka-public-docs-$buildId.zip")
6262
}
6363

64-
if (project.findProject(":jetifier-standalone") != null) {
64+
if (project.findProject(":jetifier:jetifier-standalone") != null) {
6565
filesNames.add("jetifier-standalone.zip")
6666
filesNames.add("top-of-tree-m2repository-partially-dejetified-$buildId.zip")
6767
}

‎buildSrc/src/main/kotlin/androidx/build/Jetify.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ val archivesToDejetify = listOf(
9797
)
9898

9999
fun Project.partiallyDejetifyArchiveTask(archiveFile: Provider<RegularFile>): TaskProvider<Exec>? {
100-
return findProject(":jetifier-standalone")?.let { standaloneProject ->
100+
return findProject(":jetifier:jetifier-standalone")?.let { standaloneProject ->
101101
val stripTask = stripArchiveForPartialDejetificationTask(archiveFile)
102102

103103
tasks.register("partiallyDejetifyArchive", Exec::class.java) {

‎compose/foundation/foundation/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757

5858
androidTestImplementation(project(":compose:test-utils"))
5959
androidTestImplementation(project(":compose:ui:ui-test-font"))
60-
androidTestImplementation(project(":test-screenshot"))
60+
androidTestImplementation(project(":test:screenshot:test-screenshot"))
6161
androidTestImplementation(libs.testUiautomator)
6262
androidTestImplementation(libs.testRules)
6363
androidTestImplementation(libs.testRunner)
@@ -118,7 +118,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
118118
androidAndroidTest.dependencies {
119119
implementation(project(":compose:test-utils"))
120120
implementation(project(":compose:ui:ui-test-font"))
121-
implementation(project(":test-screenshot"))
121+
implementation(project(":test:screenshot:test-screenshot"))
122122
implementation(project(":activity:activity-compose"))
123123

124124
implementation(libs.testUiautomator)

‎compose/material/material-icons-extended/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ dependencies {
5353
androidTestImplementation(project(":compose:foundation:foundation"))
5454
androidTestImplementation(project(":compose:foundation:foundation-layout"))
5555
androidTestImplementation(project(":compose:ui:ui"))
56-
androidTestImplementation(project(":test-screenshot"))
56+
androidTestImplementation(project(":test:screenshot:test-screenshot"))
5757
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
5858
androidTestImplementation(project(":compose:test-utils"))
5959
androidTestImplementation(project(":activity:activity-compose"))
@@ -72,7 +72,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
7272
implementation(project(":compose:foundation:foundation"))
7373
implementation(project(":compose:foundation:foundation-layout"))
7474
implementation(project(":compose:ui:ui"))
75-
implementation(project(":test-screenshot"))
75+
implementation(project(":test:screenshot:test-screenshot"))
7676
implementation(project(":compose:ui:ui-test-junit4"))
7777
implementation(project(":activity:activity-compose"))
7878
implementation("androidx.appcompat:appcompat:1.3.0-beta01")

‎compose/material/material/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies {
5454

5555
androidTestImplementation(project(":compose:material:material:material-samples"))
5656
androidTestImplementation(project(":compose:test-utils"))
57-
androidTestImplementation(project(":test-screenshot"))
57+
androidTestImplementation(project(":test:screenshot:test-screenshot"))
5858
androidTestImplementation(libs.testRules)
5959
androidTestImplementation(libs.testRunner)
6060
androidTestImplementation(libs.junit)
@@ -110,7 +110,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
110110
androidAndroidTest.dependencies {
111111
implementation(project(":compose:material:material:material-samples"))
112112
implementation(project(":compose:test-utils"))
113-
implementation(project(":test-screenshot"))
113+
implementation(project(":test:screenshot:test-screenshot"))
114114

115115
implementation(libs.testRules)
116116
implementation(libs.testRunner)

‎compose/test-utils/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636

3737
api("androidx.activity:activity:1.2.0")
3838
api(projectOrArtifact(":compose:ui:ui-test-junit4"))
39-
api(project(":test-screenshot"))
39+
api(project(":test:screenshot:test-screenshot"))
4040

4141
implementation(libs.kotlinStdlibCommon)
4242
implementation(projectOrArtifact(":compose:runtime:runtime"))
@@ -77,7 +77,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
7777
api("androidx.activity:activity:1.2.0")
7878
implementation project(":activity:activity-compose")
7979
api(projectOrArtifact(":compose:ui:ui-test-junit4"))
80-
api(project(":test-screenshot"))
80+
api(project(":test:screenshot:test-screenshot"))
8181
// This has stub APIs for access to legacy Android APIs, so we don't want
8282
// any dependency on this module.
8383
compileOnly(projectOrArtifact(":compose:ui:ui-android-stubs"))

‎compose/ui/ui/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ dependencies {
9494
androidTestImplementation(project(":compose:test-utils"))
9595
androidTestImplementation(project(":compose:ui:ui-test-font"))
9696
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
97-
androidTestImplementation(project(":test-screenshot"))
97+
androidTestImplementation(project(":test:screenshot:test-screenshot"))
9898
androidTestImplementation("androidx.recyclerview:recyclerview:1.1.0")
9999
androidTestImplementation("androidx.core:core-ktx:1.1.0")
100100
androidTestImplementation(project(":activity:activity-compose"))
@@ -194,7 +194,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
194194
implementation(project(":compose:test-utils"))
195195
implementation(project(":compose:ui:ui-test-font"))
196196
implementation(project(":compose:ui:ui-test-junit4"))
197-
implementation(project(":test-screenshot"))
197+
implementation(project(":test:screenshot:test-screenshot"))
198198
implementation("androidx.recyclerview:recyclerview:1.1.0")
199199
implementation("androidx.core:core-ktx:1.1.0")
200200
implementation(project(":activity:activity-compose"))

‎datastore/datastore-preferences-core/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BundleInsideHelper.forInsideJar(
3131

3232
dependencies {
3333
bundleInside(project(
34-
path: ":datastore:datastore-preferences-core:datastore-preferences-proto",
34+
path: ":datastore:datastore-preferences-proto",
3535
configuration: "export"
3636
))
3737
api(libs.kotlinStdlib)

‎docs-tip-of-tree/build.gradle

+17-17
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ dependencies {
77
docs(project(":activity:activity"))
88
docs(project(":activity:activity-compose"))
99
docs(project(":activity:activity-ktx"))
10-
docs(project(":ads-identifier"))
11-
docs(project(":ads-identifier-common"))
12-
docs(project(":ads-identifier-provider"))
13-
docs(project(":ads-identifier-testing"))
10+
docs(project(":ads:ads-identifier"))
11+
docs(project(":ads:ads-identifier-common"))
12+
docs(project(":ads:ads-identifier-provider"))
13+
docs(project(":ads:ads-identifier-testing"))
1414
docs(project(":annotation:annotation"))
1515
docs(project(":annotation:annotation-experimental"))
1616
docs(project(":appcompat:appcompat"))
@@ -91,20 +91,20 @@ dependencies {
9191
docs(project(":concurrent:concurrent-futures-ktx"))
9292
docs(project(":contentpager:contentpager"))
9393
docs(project(":coordinatorlayout:coordinatorlayout"))
94-
docs(project(":core-role"))
9594
docs(project(":core:core"))
9695
docs(project(":core:core-animation"))
9796
docs(project(":core:core-animation-testing"))
9897
docs(project(":core:core-appdigest"))
9998
docs(project(":core:core-google-shortcuts"))
10099
docs(project(":core:core-ktx"))
100+
docs(project(":core:core-role"))
101101
docs(project(":cursoradapter:cursoradapter"))
102102
docs(project(":customview:customview"))
103103
docs(project(":datastore:datastore"))
104104
docs(project(":datastore:datastore-core"))
105105
docs(project(":datastore:datastore-preferences"))
106106
docs(project(":datastore:datastore-preferences-core"))
107-
docs(project(":datastore:datastore-preferences-core:datastore-preferences-proto"))
107+
docs(project(":datastore:datastore-preferences-proto"))
108108
docs(project(":datastore:datastore-preferences-rxjava2"))
109109
docs(project(":datastore:datastore-preferences-rxjava3"))
110110
docs(project(":datastore:datastore-proto"))
@@ -114,15 +114,15 @@ dependencies {
114114
docs(project(":drawerlayout:drawerlayout"))
115115
docs(project(":dynamicanimation:dynamicanimation"))
116116
docs(project(":dynamicanimation:dynamicanimation-ktx"))
117-
docs(project(":emoji"))
118-
docs(project(":emoji-appcompat"))
119-
docs(project(":emoji-bundled"))
117+
docs(project(":emoji:emoji"))
118+
docs(project(":emoji:emoji-appcompat"))
119+
docs(project(":emoji:emoji-bundled"))
120120
docs(project(":emoji2:emoji2"))
121121
docs(project(":emoji2:emoji2-bundled"))
122122
docs(project(":emoji2:emoji2-views"))
123123
docs(project(":emoji2:emoji2-views-helper"))
124-
docs(project(":enterprise-feedback"))
125-
docs(project(":enterprise-feedback-testing"))
124+
docs(project(":enterprise:enterprise-feedback"))
125+
docs(project(":enterprise:enterprise-feedback-testing"))
126126
docs(project(":exifinterface:exifinterface"))
127127
docs(project(":fragment:fragment"))
128128
docs(project(":fragment:fragment-ktx"))
@@ -221,17 +221,17 @@ dependencies {
221221
docs(project(":security:security-crypto-ktx"))
222222
docs(project(":security:security-identity-credential"))
223223
docs(project(":sharetarget:sharetarget"))
224-
docs(project(":slice-builders"))
225-
docs(project(":slice-builders-ktx"))
226-
docs(project(":slice-core"))
227-
docs(project(":slice-remotecallback"))
228-
docs(project(":slice-view"))
224+
docs(project(":slice:slice-builders"))
225+
docs(project(":slice:slice-builders-ktx"))
226+
docs(project(":slice:slice-core"))
227+
docs(project(":slice:slice-remotecallback"))
228+
docs(project(":slice:slice-view"))
229229
docs(project(":slidingpanelayout:slidingpanelayout"))
230230
docs(project(":sqlite:sqlite"))
231231
docs(project(":sqlite:sqlite-framework"))
232232
docs(project(":sqlite:sqlite-ktx"))
233233
docs(project(":startup:startup-runtime"))
234-
docs(project(":legacy-support-core-utils"))
234+
docs(project(":legacy:legacy-support-core-utils"))
235235
docs(project(":swiperefreshlayout:swiperefreshlayout"))
236236
docs(project(":textclassifier:textclassifier"))
237237
docs(project(":tracing:tracing"))

‎emoji/appcompat/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
}
2525

2626
dependencies {
27-
api(project(":emoji"))
27+
api(project(":emoji:emoji"))
2828
api("androidx.appcompat:appcompat:1.1.0")
2929
}
3030

‎emoji/bundled/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
}
1919

2020
dependencies {
21-
api(project(":emoji"))
21+
api(project(":emoji:emoji"))
2222
}
2323

2424
androidx {

‎enterprise/feedback/testing/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
id("com.android.library")
2323
}
2424
dependencies {
25-
api(project(":enterprise-feedback:"))
25+
api(project(":enterprise:enterprise-feedback:"))
2626
testImplementation(libs.truth)
2727
}
2828
android {

‎jetifier/jetifier/preprocessor/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ plugins {
2323
mainClassName = "com.android.tools.build.jetifier.preprocessor.MainKt"
2424

2525
dependencies {
26-
api(project(":jetifier-processor"))
26+
api(project(":jetifier:jetifier-processor"))
2727
api("commons-cli:commons-cli:1.3.1")
2828
}

‎jetifier/jetifier/processor/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
}
2525

2626
dependencies {
27-
api(project(":jetifier-core"))
27+
api(project(":jetifier:jetifier-core"))
2828
api("org.ow2.asm:asm:8.0.1")
2929
api("org.ow2.asm:asm-util:8.0.1")
3030
api("org.ow2.asm:asm-commons:8.0.1")

‎jetifier/jetifier/standalone/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plugins {
2525
mainClassName = "com.android.tools.build.jetifier.standalone.Main"
2626

2727
dependencies {
28-
api(project(":jetifier-processor"))
28+
api(project(":jetifier:jetifier-processor"))
2929
api("commons-cli:commons-cli:1.3.1")
3030
}
3131

‎playground-common/playground-include-settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def isNeededForComposePlayground(name) {
114114
if (name == ":compose:lint:internal-lint-checks") return true
115115
if (name == ":compose:test-utils") return true
116116
if (name == ":compose:lint:common-test") return true
117-
if (name == ":test-screenshot") return true
117+
if (name == ":test:screenshot:test-screenshot") return true
118118
return false
119119
}
120120

‎samples/Support4Demos/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation(project(":localbroadcastmanager:localbroadcastmanager"))
1111
implementation(project(":slidingpanelayout:slidingpanelayout"))
1212
implementation(project(":swiperefreshlayout:swiperefreshlayout"))
13-
implementation(project(":legacy-support-core-utils"))
13+
implementation(project(":legacy:legacy-support-core-utils"))
1414
implementation(project(":fragment:fragment-ktx"))
1515
implementation(project(":media:media"))
1616
implementation(project(":viewpager:viewpager"))

‎samples/SupportSliceDemos/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ plugins {
2020
}
2121

2222
dependencies {
23-
implementation(project(":slice-view"))
24-
implementation(project(":slice-builders"))
25-
implementation(project(":slice-core"))
26-
implementation(project(":slice-test"))
23+
implementation(project(":slice:slice-view"))
24+
implementation(project(":slice:slice-builders"))
25+
implementation(project(":slice:slice-core"))
26+
implementation(project(":slice:slice-test"))
2727
implementation(project(":transition:transition"))
2828
implementation(project(":recyclerview:recyclerview"))
2929
implementation(project(":appcompat:appcompat"))

0 commit comments

Comments
 (0)