Merge cd118ce into ecea64b

Author: daymxn

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

@@ -138,9 +138,9 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
               firebaseLibrary.artifactId.get() // these dont get populated until afterEvaluate :(
             groupId = firebaseLibrary.groupId.get()
 
-            firebaseLibrary.applyPomCustomization(pom)
+            firebaseLibrary.customizePom(pom)
             firebaseLibrary.applyPomTransformations(pom)
-            from(components.findByName(firebaseLibrary.type.componentName))
+            from(components.findByName(firebaseLibrary.type.get().componentName))
           }
         }
       }
@@ -209,7 +209,9 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
 // TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
 fun FirebaseLibraryExtension.resolveAndroidDependencies() =
   resolveExternalAndroidLibraries() +
-    resolveProjectLevelDependencies().filter { it.type == LibraryType.ANDROID }.map { it.mavenName }
+    resolveProjectLevelDependencies()
+      .filter { it.type.get() == LibraryType.ANDROID }
+      .map { it.mavenName.get() }
 
 /**
  * A list of project level dependencies.
@@ -221,8 +223,10 @@ fun FirebaseLibraryExtension.resolveAndroidDependencies() =
  */
 // TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
 fun FirebaseLibraryExtension.resolveProjectLevelDependencies() =
-  project.configurations
-    .getByName(runtimeClasspath)
+  project
+    .get()
+    .configurations
+    .getByName(runtimeClasspath.get())
     .allDependencies
     .mapNotNull { it as? ProjectDependency }
     .map {
@@ -245,8 +249,10 @@ fun FirebaseLibraryExtension.resolveProjectLevelDependencies() =
  */
 // TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
 fun FirebaseLibraryExtension.resolveExternalAndroidLibraries() =
-  project.configurations
-    .getByName(runtimeClasspath)
+  project
+    .get()
+    .configurations
+    .getByName(runtimeClasspath.get())
     .incoming
     .artifactView { attributes { attribute("artifactType", "aar") } }
     .artifacts
@@ -296,5 +302,5 @@ val FirebaseLibraryExtension.latestVersion: ModuleVersion
  */
 val FirebaseLibraryExtension.namespace: String
   get() =
-    project.extensions.getByType<LibraryExtension>().namespace
-      ?: throw RuntimeException("Project doesn't have a defined namespace: ${project.path}")
+    project.get().extensions.getByType<LibraryExtension>().namespace
+      ?: throw RuntimeException("Project doesn't have a defined namespace: ${project.get().path}")

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

@@ -122,7 +122,7 @@ abstract class DackkaPlugin : Plugin<Project> {
 
     // TODO(b/270576405): remove afterEvalutate after fixed
     project.afterEvaluate {
-      if (weShouldPublish(this)) {
+      if (weShouldPublish(this).get()) {
         val dackkaOutputDirectory = provider { fileFromBuildDir("dackkaRawOutput") }
         val transformedFilesDirectory = provider { fileFromBuildDir("dackkaTransformedFiles") }
 

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

@@ -47,9 +47,9 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
   }
 
   private fun setupFirebaseLibraryExtension(project: Project) {
-    val firebaseLibrary =
-      project.extensions.create<FirebaseLibraryExtension>("firebaseLibrary", project, JAVA)
+    val firebaseLibrary = project.extensions.create<FirebaseLibraryExtension>("firebaseLibrary")
 
+    firebaseLibrary.commonConfiguration(project, JAVA)
     setupStaticAnalysis(project, firebaseLibrary)
     setupApiInformationAnalysis(project)
     getIsPomValidTask(project, firebaseLibrary)
@@ -59,33 +59,38 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
   private fun setupVersionCheckTasks(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
     project.tasks.register<GmavenVersionChecker>("gmavenVersionCheck") {
-      groupId.value(firebaseLibrary.groupId.get())
-      artifactId.value(firebaseLibrary.artifactId.get())
+      groupId.value(firebaseLibrary.groupId)
+      artifactId.value(firebaseLibrary.artifactId)
       version.value(firebaseLibrary.version)
-      latestReleasedVersion.value(firebaseLibrary.latestReleasedVersion.orElseGet { "" })
+      latestReleasedVersion.value(firebaseLibrary.latestReleasedVersion.orElse(""))
     }
     project.mkdir("semver")
     project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
       dependsOn("jar")
       project.file("semver/previous.jar").delete()
-      groupId.value(firebaseLibrary.groupId.get())
-      artifactId.value(firebaseLibrary.artifactId.get())
+      groupId.value(firebaseLibrary.groupId)
+      artifactId.value(firebaseLibrary.artifactId)
       aarAndroidFile.value(false)
       filePath.value(project.file("semver/previous.jar").absolutePath)
     }
     val currentJarFile =
-      project
-        .file("build/libs/${firebaseLibrary.artifactId.get()}-${firebaseLibrary.version}.jar")
-        .absolutePath
+      firebaseLibrary.artifactId.flatMap { artifactId ->
+        firebaseLibrary.version.map { version ->
+          project.file("build/libs/$artifactId-$version").absolutePath
+        }
+      }
     val previousJarFile = project.file("semver/previous.jar").absolutePath
+    val previousVersion =
+      firebaseLibrary.artifactId.flatMap { artifactId ->
+        firebaseLibrary.groupId.map { groupId ->
+          GmavenHelper(groupId, artifactId).getLatestReleasedVersion()
+        }
+      }
     project.tasks.register<ApiDiffer>("semverCheck") {
       currentJar.value(currentJarFile)
       previousJar.value(previousJarFile)
       version.value(firebaseLibrary.version)
-      previousVersionString.value(
-        GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
-          .getLatestReleasedVersion()
-      )
+      previousVersionString.value(previousVersion)
 
       dependsOn("copyPreviousArtifacts")
     }