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

AndroidDependencyResolver: fixed NPE

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2021-02-11 23:16:59 +01:00
parent abc44fa658
commit 7eb5fc7778
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt
+7 -5
View File
@@ -126,11 +126,13 @@ object AndroidDependencyResolver {
if (entry.key == "androidMain") { if (entry.key == "androidMain") {
// this is a terrible hack, but looks like the only way, other than proper support via light-classes // this is a terrible hack, but looks like the only way, other than proper support via light-classes
val task = project.tasks.findByName("processDebugResources") val task = project.tasks.findByName("processDebugResources")
getClassOrNull("com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask")?.let { linkAppClass -> if (task != null) {
@Suppress("UNCHECKED_CAST") getClassOrNull("com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask")?.let { linkAppClass ->
val rClassOutputJar = @Suppress("UNCHECKED_CAST")
linkAppClass.getMethodOrNull("getRClassOutputJar")?.invoke(task) as Provider<FileSystemLocation>? val rClassOutputJar =
rClassOutputJar?.orNull?.asFile?.let { result += AndroidDependency("R.jar", it) } linkAppClass.getMethodOrNull("getRClassOutputJar")?.invoke(task) as Provider<FileSystemLocation>?
rClassOutputJar?.orNull?.asFile?.let { result += AndroidDependency("R.jar", it) }
}
} }
} }