| commit | 6b896ab52e5a6ba43349d6013f1f7ebb4da1ead0 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <[email protected]> | Mon Dec 04 16:24:48 2023 +0000 |
| committer | Gerrit Code Review <[email protected]> | Mon Dec 04 16:24:48 2023 +0000 |
| tree | a6348baeeefc1946fe42249d0b4ea581f87b3bdc | |
| parent | 5ad9ee1e8d57c80ee195d6dd1b01d6b475ccaee5 [diff] | |
| parent | 515159805eea00f1799704e12573688f0a0f6f70 [diff] |
Merge "Use compile scope when inserting default platform dependency" into androidx-main
diff --git a/buildSrc-tests/src/test/java/androidx/build/MavenUploadHelperTest.kt b/buildSrc-tests/src/test/java/androidx/build/MavenUploadHelperTest.kt index da267c6..e4e2046e 100644 --- a/buildSrc-tests/src/test/java/androidx/build/MavenUploadHelperTest.kt +++ b/buildSrc-tests/src/test/java/androidx/build/MavenUploadHelperTest.kt
@@ -78,7 +78,7 @@ <groupId>androidx.collection</groupId> <artifactId>collection-jvm</artifactId> <version>1.3.0-alpha05</version> - <scope>runtime</scope> + <scope>compile</scope> </dependency> </dependencies> </project> @@ -136,7 +136,7 @@ <artifactId>ui-geometry-android</artifactId> <version>1.6.0-alpha01</version> <type>aar</type> - <scope>runtime</scope> + <scope>compile</scope> </dependency> </dependencies> </project>
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt b/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt index abeaaac..55441d96 100644 --- a/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt +++ b/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt
@@ -542,7 +542,7 @@ if (platformId == PlatformIdentifier.ANDROID.id) { appendElement("type", "aar") } - appendElement("scope", "runtime") + appendElement("scope", "compile") } }