Skip to content

Commit d33fd96

Browse files
makotokatojonalmeida
authored andcommitted
Use destinationDirectory instead of destinationDir
`JavaCompile.destinationDir` is deprecated [*1] and will be removed by 9.0. We should use `destinationDirectory` instead of `destinationDir`. *1 https://docs.gradle.org/current/dsl/org.gradle.api.tasks.compile.JavaCompile.html#org.gradle.api.tasks.compile.JavaCompile:destinationDir
1 parent d3ad0a0 commit d33fd96

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

apilint/src/main/groovy/org/mozilla/apilint/ApiLintPlugin.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ApiLintPlugin implements Plugin<Project> {
2323
// TODO: support applications
2424
project.android.libraryVariants.all { variant ->
2525
def name = variant.name.capitalize()
26-
def apiFileName = "${variant.javaCompileProvider.get().destinationDir}/${extension.apiOutputFileName}"
26+
def apiFileName = "${variant.javaCompileProvider.get().destinationDirectory.get()}/${extension.apiOutputFileName}"
2727
def apiFile = project.file(apiFileName)
2828

2929
def currentApiFile = project.file(extension.currentApiRelativeFilePath)
@@ -62,7 +62,7 @@ class ApiLintPlugin implements Plugin<Project> {
6262
args currentApiFile
6363
args '--result-json'
6464
args project.file(
65-
"${variant.javaCompileProvider.get().destinationDir}/${extension.jsonResultFileName}")
65+
"${variant.javaCompileProvider.get().destinationDirectory.get()}/${extension.jsonResultFileName}")
6666
args '--append-json'
6767
args '--api-map'
6868
args project.file(apiFileName + ".map")
@@ -85,7 +85,7 @@ class ApiLintPlugin implements Plugin<Project> {
8585
args apiFile
8686
args '--result-json'
8787
args project.file(
88-
"${variant.javaCompileProvider.get().destinationDir}/${extension.jsonResultFileName}")
88+
"${variant.javaCompileProvider.get().destinationDirectory.get()}/${extension.jsonResultFileName}")
8989
if (extension.lintFilters != null) {
9090
args '--filter-errors'
9191
args extension.lintFilters
@@ -126,7 +126,7 @@ class ApiLintPlugin implements Plugin<Project> {
126126
args project.file(extension.changelogFileName)
127127
args '--result-json'
128128
args project.file(
129-
"${variant.javaCompileProvider.get().destinationDir}/${extension.jsonResultFileName}")
129+
"${variant.javaCompileProvider.get().destinationDirectory.get()}/${extension.jsonResultFileName}")
130130
}
131131

132132
apiChangelogCheck.dependsOn apiGenerate

0 commit comments

Comments
 (0)