Skip to content

Commit 0a35d65

Browse files
mathjeffmathjeff
committed
removing explicit setting of library groups
and instead always computing it based on the project path Test: ./gradlew help Test: git checkout HEAD^ -- core && ./gradlew help # and see that trying to set mavenGroup causes a failure Test: run `./gradlew printCoordinates` before and after this change, sort the output of each, and see that both results are the same Test: Treehugger runs busytown/*.sh Change-Id: Ib0cbff084c15198373c9d5d9c10a702703a44214 Merged-In: Ib0cbff084c15198373c9d5d9c10a702703a44214
1 parent f229c07 commit 0a35d65

File tree

507 files changed

+9
-570
lines changed

Some content is hidden

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

507 files changed

+9
-570
lines changed

‎activity/activity-compose-lint/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ dependencies {
4242
androidx {
4343
name = "Activity Compose Lint"
4444
type = LibraryType.LINT
45-
mavenGroup = LibraryGroups.ACTIVITY
4645
inceptionYear = "2021"
4746
description = "Lint checks for Activity Compose"
4847
}

‎activity/activity-compose/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ dependencies {
5656
androidx {
5757
name = "Activity Compose"
5858
publish = Publish.SNAPSHOT_AND_RELEASE
59-
mavenGroup = LibraryGroups.ACTIVITY
6059
inceptionYear = "2020"
6160
description = "Compose integration with Activity"
6261
runApiTasks = new RunApiTasks.Yes()

‎activity/activity-compose/samples/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ dependencies {
4242
androidx {
4343
name = "AndroidX Compose UI Activity Integration Samples"
4444
type = LibraryType.SAMPLES
45-
mavenGroup = LibraryGroups.ACTIVITY
4645
inceptionYear = "2020"
4746
description = "Samples for Compose integration with Activity"
4847
}

‎activity/activity-ktx/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies {
5757
androidx {
5858
name = "Activity Kotlin Extensions"
5959
publish = Publish.SNAPSHOT_AND_RELEASE
60-
mavenGroup = LibraryGroups.ACTIVITY
6160
inceptionYear = "2018"
6261
description = "Kotlin extensions for 'activity' artifact"
6362
}

‎activity/activity-lint/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
androidx {
3939
name = "Android Activity Lint Checks"
4040
type = LibraryType.LINT
41-
mavenGroup = LibraryGroups.ACTIVITY
4241
inceptionYear = "2020"
4342
description = "Android Activity Lint Checks"
4443
}

‎activity/activity/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ dependencies {
5050
androidx {
5151
name = "Activity"
5252
publish = Publish.SNAPSHOT_AND_RELEASE
53-
mavenGroup = LibraryGroups.ACTIVITY
5453
inceptionYear = "2018"
5554
description = "Provides the base Activity subclass and the relevant hooks to build a composable structure on top."
5655
}

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

-3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,3 @@ android {
4040
namespace "androidx.ads.identifier.benchmark"
4141
}
4242

43-
androidx {
44-
mavenGroup = LibraryGroups.ADS
45-
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ androidx {
4444
name = "AndroidX Ads Identifier Common"
4545
publish = Publish.SNAPSHOT_AND_RELEASE
4646
mavenVersion = LibraryVersions.ADS_IDENTIFIER
47-
mavenGroup = LibraryGroups.ADS
4847
inceptionYear = "2019"
4948
description = "AndroidX Ads Identifier Common"
5049
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ androidx {
4343
name = "AndroidX Ads Identifier Provider"
4444
publish = Publish.SNAPSHOT_AND_RELEASE
4545
mavenVersion = LibraryVersions.ADS_IDENTIFIER
46-
mavenGroup = LibraryGroups.ADS
4746
inceptionYear = "2019"
4847
description = "AndroidX Ads Identifier Provider"
4948
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ android {
3636

3737
androidx {
3838
type = LibraryType.INTERNAL_TEST_LIBRARY
39-
mavenGroup = LibraryGroups.ADS
4039
}

‎ads/ads-identifier/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ androidx {
4545
name = "AndroidX Ads Identifier"
4646
publish = Publish.SNAPSHOT_AND_RELEASE
4747
mavenVersion = LibraryVersions.ADS_IDENTIFIER
48-
mavenGroup = LibraryGroups.ADS
4948
inceptionYear = "2019"
5049
description = "AndroidX Ads Identifier"
5150
}

‎annotation/annotation-experimental-lint/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ androidx {
4242
name = "Experimental annotation lint checks"
4343
type = LibraryType.LINT
4444
mavenVersion = LibraryVersions.ANNOTATION_EXPERIMENTAL
45-
mavenGroup = LibraryGroups.ANNOTATION
4645
inceptionYear = "2019"
4746
description = "Lint checks for the Experimental annotation library. Also enforces the " +
4847
"semantics of Kotlin @Experimental APIs from within Android Java source code."

‎annotation/annotation-experimental-lint/integration-tests/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,4 @@ tasks.withType(KotlinCompile).configureEach {
4848

4949
androidx {
5050
type = LibraryType.INTERNAL_TEST_LIBRARY
51-
mavenGroup = LibraryGroups.ANNOTATION
5251
}

‎annotation/annotation-experimental/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ androidx {
3131
name = "Experimental annotation"
3232
publish = Publish.SNAPSHOT_AND_RELEASE
3333
mavenVersion = LibraryVersions.ANNOTATION_EXPERIMENTAL
34-
mavenGroup = LibraryGroups.ANNOTATION
3534
inceptionYear = "2019"
3635
description = "Java annotation for use on unstable Android API surfaces. When used in " +
3736
"conjunction with the Experimental annotation lint checks, this annotation provides " +

‎annotation/annotation-sampled/build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,3 @@ dependencies {
2323
implementation(libs.kotlinStdlib)
2424
}
2525

26-
androidx {
27-
mavenGroup = LibraryGroups.ANNOTATION
28-
}

‎annotation/annotation/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ androidx {
7272
name = "Android Support Library Annotations"
7373
type = LibraryType.PUBLISHED_LIBRARY
7474
mavenVersion = LibraryVersions.ANNOTATION
75-
mavenGroup = LibraryGroups.ANNOTATION
7675
inceptionYear = "2013"
7776
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs."
7877
}

‎appactions/interaction/interaction-proto/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ android {
3434
androidx {
3535
name = "androidx.appactions.interaction:interaction-proto"
3636
type = LibraryType.PUBLISHED_LIBRARY
37-
mavenGroup = LibraryGroups.APPACTIONS_INTERACTION
3837
inceptionYear = "2022"
3938
description = "Protos for use with App Action interaction libraries."
4039
}

‎appcompat/appcompat-benchmark/build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,3 @@ android {
3535
namespace "androidx.appcompat.benchmark"
3636
}
3737

38-
androidx {
39-
mavenGroup = LibraryGroups.APPCOMPAT
40-
}

‎appcompat/appcompat-lint/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ dependencies {
4141
androidx {
4242
name = "AppCompat Lint Checks"
4343
type = LibraryType.LINT
44-
mavenGroup = LibraryGroups.APPCOMPAT
4544
inceptionYear = "2019"
4645
description = "AppCompat Lint Checks"
4746
}

‎appcompat/appcompat-resources/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ android {
6666
androidx {
6767
name = "Android Resources Library"
6868
publish = Publish.SNAPSHOT_AND_RELEASE
69-
mavenGroup = LibraryGroups.APPCOMPAT
7069
inceptionYear = "2019"
7170
description = "The Resources Library is a static library that you can add to your Android application in order to use resource APIs that backport the latest APIs to older versions of the platform. Compatible on devices running API 14 or later."
7271
}

‎appcompat/appcompat/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ android {
102102
androidx {
103103
name = "Android AppCompat Library"
104104
publish = Publish.SNAPSHOT_AND_RELEASE
105-
mavenGroup = LibraryGroups.APPCOMPAT
106105
inceptionYear = "2011"
107106
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren\'t a part of the framework APIs. Compatible on devices running API 14 or later."
108107
failOnDeprecationWarnings = false

‎appsearch/appsearch-builtin-types/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939
androidx {
4040
name = 'AppSearch Builtin Types'
4141
publish = Publish.SNAPSHOT_AND_RELEASE
42-
mavenGroup = LibraryGroups.APPSEARCH
4342
inceptionYear = '2021'
4443
description = 'Contains AppSearch Document classes and builders for a variety of common ' +
4544
'objects based on http://schema.org. Data interchange with the system, and other ' +

‎appsearch/appsearch-debug-view/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ dependencies {
4646
androidx {
4747
name = "AndroidX AppSearch Debug View"
4848
type = LibraryType.PUBLISHED_LIBRARY
49-
mavenGroup = LibraryGroups.APPSEARCH
5049
inceptionYear = "2021"
5150
description = "A support library for AndroidX AppSearch that contains activities and views " +
5251
"for debugging an application's integration with AppSearch."

‎appsearch/appsearch-debug-view/samples/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ dependencies {
4848
androidx {
4949
name = "AndroidX AppSearch Debug View Sample App"
5050
type = LibraryType.SAMPLES
51-
mavenGroup = LibraryGroups.APPSEARCH
5251
inceptionYear = "2021"
5352
description = "Contains a sample app for integrating the Androidx AppSearch Debug View"
5453
}

‎appsearch/appsearch-ktx/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
androidx {
3939
name = 'AndroidX AppSearch - Kotlin Extensions'
4040
publish = Publish.SNAPSHOT_AND_RELEASE
41-
mavenGroup = LibraryGroups.APPSEARCH
4241
inceptionYear = '2021'
4342
description = 'AndroidX AppSearch - Kotlin Extensions'
4443
}

‎appsearch/appsearch-local-storage/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ dependencies {
8888
androidx {
8989
name = "AppSearch Local Storage"
9090
publish = Publish.SNAPSHOT_AND_RELEASE
91-
mavenGroup = LibraryGroups.APPSEARCH
9291
inceptionYear = "2020"
9392
description =
9493
"An implementation of AppSearchSession which uses local app storage and a local copy of " +

‎appsearch/appsearch-platform-storage/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
androidx {
3939
name = "AppSearch Platform Storage"
4040
publish = Publish.SNAPSHOT_AND_RELEASE
41-
mavenGroup = LibraryGroups.APPSEARCH
4241
inceptionYear = "2021"
4342
description =
4443
"An implementation of AppSearchSession which uses the AppSearch service on Android S+"

‎appsearch/appsearch-test-util/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ androidx {
3939
name = 'AppSearch Test Util'
4040
type = LibraryType.INTERNAL_TEST_LIBRARY
4141
publish = Publish.NONE
42-
mavenGroup = LibraryGroups.APPSEARCH
4342
inceptionYear = '2021'
4443
description = 'Test Utilities to be used by any test module for AppSearch'
4544
}

‎appsearch/appsearch/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies {
5757
androidx {
5858
name = 'AndroidX AppSearch'
5959
publish = Publish.SNAPSHOT_AND_RELEASE
60-
mavenGroup = LibraryGroups.APPSEARCH
6160
inceptionYear = '2019'
6261
description = 'AndroidX AppSearch - App Indexing'
6362
}

‎appsearch/compiler/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939
androidx {
4040
name = 'AndroidX AppSearch Compiler'
4141
type = LibraryType.ANNOTATION_PROCESSOR
42-
mavenGroup = LibraryGroups.APPSEARCH
4342
inceptionYear = '2019'
4443
description = 'Compiler for classes annotated with @androidx.appsearch.annotation.Document'
4544
failOnDeprecationWarnings = false

‎arch/core/core-common/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dependencies {
3131
androidx {
3232
name = "Android Arch-Common"
3333
publish = Publish.SNAPSHOT_AND_RELEASE
34-
mavenGroup = LibraryGroups.ARCH_CORE
3534
inceptionYear = "2017"
3635
description = "Android Arch-Common"
3736
}

‎arch/core/core-runtime/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
androidx {
3030
name = "Android Arch-Runtime"
3131
publish = Publish.SNAPSHOT_AND_RELEASE
32-
mavenGroup = LibraryGroups.ARCH_CORE
3332
inceptionYear = "2017"
3433
description = "Android Arch-Runtime"
3534
}

‎arch/core/core-testing/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939
androidx {
4040
name = "Android Core-Testing"
4141
publish = Publish.SNAPSHOT_AND_RELEASE
42-
mavenGroup = LibraryGroups.ARCH_CORE
4342
inceptionYear = "2017"
4443
description = "Android Core-Testing"
4544
}

‎asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ dependencies {
1515
androidx {
1616
name = "AsyncLayoutInflater integration for AppCompat"
1717
publish = Publish.SNAPSHOT_AND_RELEASE
18-
mavenGroup = LibraryGroups.ASYNCLAYOUTINFLATER
1918
inceptionYear = "2022"
2019
description = "A thread-safe LayoutInflater Factory that provides compatibility between AsyncLayoutInflater and AppCompat."
2120
}

‎asynclayoutinflater/asynclayoutinflater/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dependencies {
2121
androidx {
2222
name = "Android Support Library Async Layout Inflater"
2323
publish = Publish.SNAPSHOT_AND_RELEASE
24-
mavenGroup = LibraryGroups.ASYNCLAYOUTINFLATER
2524
inceptionYear = "2018"
2625
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
2726
}

‎autofill/autofill/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ dependencies {
3636
androidx {
3737
name = "AndroidX Autofill"
3838
publish = Publish.SNAPSHOT_AND_RELEASE
39-
mavenGroup = LibraryGroups.AUTOFILL
4039
inceptionYear = "2019"
4140
description = "AndroidX Autofill"
4241
}

‎benchmark/benchmark-common/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ dependencies {
6868
androidx {
6969
name = "Android Benchmark - Common"
7070
publish = Publish.SNAPSHOT_AND_RELEASE
71-
mavenGroup = LibraryGroups.BENCHMARK
7271
inceptionYear = "2018"
7372
description = "Android Benchmark - Common"
7473
}

‎benchmark/benchmark-darwin-core/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ androidXMultiplatform {
4040

4141
androidx {
4242
name = "AndroidX Benchmarks - Darwin Core"
43-
mavenGroup = LibraryGroups.BENCHMARK
4443
inceptionYear = "2022"
4544
description = "AndroidX Benchmarks - Darwin Core"
4645
}

‎benchmark/benchmark-darwin-gradle-plugin/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ gradlePlugin {
4747
androidx {
4848
name = "AndroidX Benchmarks - Darwin Gradle Plugin"
4949
type = LibraryType.GRADLE_PLUGIN
50-
mavenGroup = LibraryGroups.BENCHMARK
5150
inceptionYear = "2022"
5251
description = "AndroidX Benchmarks - Darwin Gradle Plugin"
5352
}

‎benchmark/benchmark-darwin-samples/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ darwinBenchmark {
6060

6161
androidx {
6262
name = "AndroidX Benchmarks - Darwin Samples"
63-
mavenGroup = LibraryGroups.BENCHMARK
6463
inceptionYear = "2022"
6564
description = "AndroidX Benchmarks - Darwin Samples"
6665
}

‎benchmark/benchmark-darwin/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ androidXMultiplatform {
4444

4545
androidx {
4646
name = "AndroidX Benchmarks - Darwin"
47-
mavenGroup = LibraryGroups.BENCHMARK
4847
inceptionYear = "2022"
4948
description = "AndroidX Benchmarks - Darwin"
5049
}

‎benchmark/benchmark-junit4/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ dependencies {
4848
androidx {
4949
name = "Android Benchmark - JUnit4"
5050
publish = Publish.SNAPSHOT_AND_RELEASE
51-
mavenGroup = LibraryGroups.BENCHMARK
5251
inceptionYear = "2019"
5352
description = "Android Benchmark - JUnit4"
5453
}

‎benchmark/benchmark-macro-junit4/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ dependencies {
5656
androidx {
5757
name = "Android Benchmark - Macrobenchmark JUnit4"
5858
publish = Publish.SNAPSHOT_AND_RELEASE
59-
mavenGroup = LibraryGroups.BENCHMARK
6059
inceptionYear = "2020"
6160
description = "Android Benchmark - Macrobenchmark JUnit4"
6261
}

‎benchmark/benchmark-macro/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ dependencies {
8181
androidx {
8282
name = "Android Benchmark - Macrobenchmark"
8383
publish = Publish.SNAPSHOT_AND_RELEASE
84-
mavenGroup = LibraryGroups.BENCHMARK
8584
inceptionYear = "2020"
8685
description = "Android Benchmark - Macrobenchmark"
8786
}

‎benchmark/benchmark/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ android {
4242

4343
androidx {
4444
type = LibraryType.INTERNAL_TEST_LIBRARY
45-
mavenGroup = LibraryGroups.BENCHMARK
4645
}

‎benchmark/gradle-plugin/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ gradlePlugin {
6060
androidx {
6161
name = "Android Benchmark Gradle Plugin"
6262
type = LibraryType.GRADLE_PLUGIN
63-
mavenGroup = LibraryGroups.BENCHMARK
6463
inceptionYear = "2019"
6564
description = "Android Benchmark Gradle Plugin"
6665
}

‎biometric/biometric-ktx/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
androidx {
3939
name = "Biometric Kotlin Extensions"
4040
publish = Publish.SNAPSHOT_AND_RELEASE
41-
mavenGroup = LibraryGroups.BIOMETRIC
4241
inceptionYear = "2020"
4342
description = "Kotlin extensions for the Biometric Library."
4443
}

‎biometric/biometric-ktx/samples/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ dependencies {
3030
androidx {
3131
name = "AndroidX Biometric Samples"
3232
type = LibraryType.SAMPLES
33-
mavenGroup = LibraryGroups.BIOMETRIC
3433
inceptionYear = "2021"
3534
description = "Contains the sample code for the AndroidX Biometric library"
3635
}

‎biometric/biometric/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ android {
7979
androidx {
8080
name = "Biometric"
8181
publish = Publish.SNAPSHOT_AND_RELEASE
82-
mavenGroup = LibraryGroups.BIOMETRIC
8382
inceptionYear = "2018"
8483
description = "The Biometric library is a static library that you can add to your Android application. It invokes BiometricPrompt on devices running P and greater, and on older devices will show a compat dialog. Compatible on devices running API 14 or later."
8584
}

‎bluetooth/bluetooth-core/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ dependencies {
3636
androidx {
3737
name = "AndroidX Bluetooth Core"
3838
publish = Publish.SNAPSHOT_AND_RELEASE
39-
mavenGroup = LibraryGroups.BLUETOOTH
4039
inceptionYear = "2022"
4140
description = "AndroidX Bluetooth Framework Kotlin Library"
4241
}

‎bluetooth/bluetooth-testing/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
androidx {
3030
name = "AndroidX Bluetooth Testing"
3131
publish = Publish.SNAPSHOT_AND_RELEASE
32-
mavenGroup = LibraryGroups.BLUETOOTH
3332
inceptionYear = "2022"
3433
description = "Test utilities for AndroidX Bluetooth"
3534
}

0 commit comments

Comments
 (0)