Skip to content

Commit 40a79f2

Browse files
committed
[plugins] Remove JavaPluginConvention from FirebaseJavaLibraryPlugin
`JavaPluginConvention` and the use of convetions in general is deprecated and will cause an error when migrated to Gradle 9.0. The recommended replacement is to use extensions.
1 parent 70c8e89 commit 40a79f2

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ import com.google.firebase.gradle.plugins.semver.GmavenCopier
2222
import org.gradle.api.Project
2323
import org.gradle.api.attributes.Attribute
2424
import org.gradle.api.plugins.JavaLibraryPlugin
25-
import org.gradle.api.plugins.JavaPluginConvention
25+
import org.gradle.api.plugins.JavaPluginExtension
2626
import org.gradle.kotlin.dsl.apply
2727
import org.gradle.kotlin.dsl.create
28-
import org.gradle.kotlin.dsl.getPlugin
2928
import org.gradle.kotlin.dsl.register
3029
import org.gradle.kotlin.dsl.withType
3130
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -120,12 +119,12 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
120119
private fun setupApiInformationAnalysis(project: Project) {
121120
val srcDirs =
122121
project.files(
123-
project.convention
124-
.getPlugin<JavaPluginConvention>()
122+
project.extensions
123+
.getByType(JavaPluginExtension::class.java)
125124
.sourceSets
126125
.getByName("main")
127126
.java
128-
.srcDirs
127+
.srcDirs()
129128
)
130129

131130
val apiInfo = getApiInfo(project, srcDirs)

0 commit comments

Comments
 (0)