azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new API from AGP to get JavaCompile task

Browse Source 
New API for getting the JavaCompile task has been
added to AGP, and the old one is deprecated. It is
now returning TaskProvider<JavaCompile>, which allows
API users to avoid configuring tasks unnecessarily.

This commit does not change anything functionally, it
is only to avoid the warning message, as reporter in
https://issuetracker.google.com/116198439.
This commit is contained in:
Ivan Gavrilovic
2018-09-21 10:16:43 +01:00
committed by Sergey Igushkin
parent 358e64fdb0
commit bb53a1c3d2
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt
+9 -3
View File
@@ -88,9 +88,15 @@ class Android25ProjectHandler(kotlinConfigurationTools: KotlinConfigurationTools
else -> null
}
override fun getJavaTask(variantData: BaseVariant): AbstractCompile? =
@Suppress("DEPRECATION") // There is always a Java compile task -- the deprecation was for Jack
variantData.javaCompile
override fun getJavaTask(variantData: BaseVariant): AbstractCompile? {
@Suppress("DEPRECATION") // There is always a Java compile task -- the deprecation was for Jack
return variantData::class.java.methods.firstOrNull { it.name == "getJavaCompileProvider" }
?.invoke(variantData)
.let { taskProvider ->
// org.gradle.api.tasks.TaskProvider is added in Gradle 4.8
taskProvider!!::class.java.methods.firstOrNull { it.name == "get" }?.invoke(taskProvider) as AbstractCompile?
} ?: variantData.javaCompile
}
override fun addJavaSourceDirectoryToVariantModel(variantData: BaseVariant, javaSourceDirectory: File) =
variantData.addJavaSourceFoldersToModel(javaSourceDirectory)