Skip to content

Commit f2ddf29

Browse files
committed
Update BaseFirebaseLibraryPlugin.kt
1 parent 36ee803 commit f2ddf29

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import org.w3c.dom.Element
4949
* @see [FirebaseLibraryExtension]
5050
*/
5151
abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
52-
5352
protected fun setupDefaults(project: Project, library: FirebaseLibraryExtension) {
5453
library.previewMode.set("")
5554
with(library) {
@@ -81,7 +80,7 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
8180
}
8281

8382
val parent = project.parent
84-
83+
// TODO(): remove when we get rid of ktx modules
8584
if (project.name == "ktx" && parent !== null) {
8685
artifactId.convention(parent.provider { "${parent.name}-ktx" })
8786
groupId.convention(parent.provider { "${parent.group}" })
@@ -199,7 +198,7 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
199198
artifactId = firebaseLibrary.artifactId.get()
200199
groupId = firebaseLibrary.groupId.get()
201200

202-
firebaseLibrary.customizePomAction.execute(pom)
201+
pom(firebaseLibrary.customizePomAction)
203202
firebaseLibrary.applyPomTransformations(pom)
204203
from(components.findByName(firebaseLibrary.type.componentName))
205204
}
@@ -216,7 +215,6 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
216215
* @param pom the [MavenPom] to prepare
217216
* @see [addTypeWithAARSupport]
218217
*/
219-
// TODO(b/270576405): Combine with applyPomCustomization when migrating FirebaseLibraryExtension
220218
private fun FirebaseLibraryExtension.applyPomTransformations(pom: MavenPom) {
221219
pom.withXml {
222220
val dependencies = asElement().findElementsByTag("dependency")

0 commit comments

Comments
 (0)