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

Kapt: Be less strict when it's impossible to add a generated Kotlin source directory for Android project (KT-22056, EA-114271)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-01-10 00:48:30 +09:00
parent 283c762b8b
commit 108e91f2a2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt
+3 -2
View File
@@ -116,8 +116,9 @@ class KaptProjectResolverExtension : AbstractProjectResolverExtension() {
try { try {
sourceSet.generatedKotlinSourcesDirFile?.let { variant.mainArtifact.generatedSourceFolders += it } sourceSet.generatedKotlinSourcesDirFile?.let { variant.mainArtifact.generatedSourceFolders += it }
} catch (e: Throwable) { } catch (e: Throwable) {
LOG.error(RuntimeException( // There was an error being thrown here, but the code above doesn't work for the newer versions of Android Studio 3
"Kapt importer for generated source roots failed, source root name: ${sourceSet.sourceSetName}", e)) // (generatedSourceFolders returns a wrapped unmodifiable list), and the thrown exception breaks the import.
// The error will be moved back when I find a work-around for AS3.
} }
} }
} }