@@ -18,11 +18,13 @@ package com.google.firebase.gradle.plugins
18
18
19
19
import com.android.build.gradle.LibraryExtension
20
20
import com.google.firebase.gradle.plugins.ci.Coverage
21
+ import com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabExtension
21
22
import java.io.File
22
23
import java.nio.file.Paths
23
24
import org.gradle.api.Plugin
24
25
import org.gradle.api.Project
25
26
import org.gradle.api.artifacts.ProjectDependency
27
+ import org.gradle.api.provider.Provider
26
28
import org.gradle.api.publish.PublishingExtension
27
29
import org.gradle.api.publish.maven.MavenPom
28
30
import org.gradle.api.publish.maven.MavenPublication
@@ -138,9 +140,9 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
138
140
firebaseLibrary.artifactId.get() // these dont get populated until afterEvaluate :(
139
141
groupId = firebaseLibrary.groupId.get()
140
142
141
- firebaseLibrary.applyPomCustomization (pom)
143
+ firebaseLibrary.customizePom (pom)
142
144
firebaseLibrary.applyPomTransformations(pom)
143
- from(components.findByName(firebaseLibrary.type.componentName))
145
+ from(components.findByName(firebaseLibrary.type.get(). componentName))
144
146
}
145
147
}
146
148
}
@@ -209,7 +211,7 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
209
211
// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
210
212
fun FirebaseLibraryExtension.resolveAndroidDependencies () =
211
213
resolveExternalAndroidLibraries() +
212
- resolveProjectLevelDependencies().filter { it.type == LibraryType .ANDROID }.map { it.mavenName }
214
+ resolveProjectLevelDependencies().filter { it.type.get() == LibraryType .ANDROID }.map { it.mavenName.get() }
213
215
214
216
/* *
215
217
* A list of project level dependencies.
@@ -221,8 +223,8 @@ fun FirebaseLibraryExtension.resolveAndroidDependencies() =
221
223
*/
222
224
// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
223
225
fun FirebaseLibraryExtension.resolveProjectLevelDependencies () =
224
- project.configurations
225
- .getByName(runtimeClasspath)
226
+ project.get(). configurations
227
+ .getByName(runtimeClasspath.get() )
226
228
.allDependencies
227
229
.mapNotNull { it as ? ProjectDependency }
228
230
.map {
@@ -245,8 +247,8 @@ fun FirebaseLibraryExtension.resolveProjectLevelDependencies() =
245
247
*/
246
248
// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
247
249
fun FirebaseLibraryExtension.resolveExternalAndroidLibraries () =
248
- project.configurations
249
- .getByName(runtimeClasspath)
250
+ project.get(). configurations
251
+ .getByName(runtimeClasspath.get() )
250
252
.incoming
251
253
.artifactView { attributes { attribute(" artifactType" , " aar" ) } }
252
254
.artifacts
@@ -296,5 +298,5 @@ val FirebaseLibraryExtension.latestVersion: ModuleVersion
296
298
*/
297
299
val FirebaseLibraryExtension .namespace: String
298
300
get() =
299
- project.extensions.getByType<LibraryExtension >().namespace
300
- ? : throw RuntimeException (" Project doesn't have a defined namespace: ${project.path} " )
301
+ project.get(). extensions.getByType<LibraryExtension >().namespace
302
+ ? : throw RuntimeException (" Project doesn't have a defined namespace: ${project.get(). path} " )
0 commit comments