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

Fix registering the non-existent Kapt3 classes directory as bytecode if

Browse Source 
Kapt3 is disabled.

(cherry picked from commit 692e23c)

(cherry picked from commit 1cbdb6c)
This commit is contained in:
Sergey Igushkin
2017-05-11 19:24:23 +03:00
committed by Alexey Tsvetkov
parent 77031ab6f9
commit 7fae7c1d55
1 changed files with 8 additions and 2 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
+8 -2
View File
@@ -8,6 +8,7 @@ import com.android.build.gradle.api.UnitTestVariant
import com.android.builder.model.SourceProvider import com.android.builder.model.SourceProvider
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin
import org.jetbrains.kotlin.gradle.internal.Kapt3KotlinGradleSubplugin import org.jetbrains.kotlin.gradle.internal.Kapt3KotlinGradleSubplugin
import org.jetbrains.kotlin.gradle.internal.KaptTask import org.jetbrains.kotlin.gradle.internal.KaptTask
import org.jetbrains.kotlin.gradle.internal.WrappedVariantData import org.jetbrains.kotlin.gradle.internal.WrappedVariantData
@@ -53,8 +54,13 @@ class Android25ProjectHandler(kotlinConfigurationTools: KotlinConfigurationTools
val preJavaKotlinOutput = val preJavaKotlinOutput =
(if (kotlinAfterJavaTask == null) (if (kotlinAfterJavaTask == null)
// Add Kapt3 output as well, since there's no SyncOutputTask with the new API project.files(kotlinTask.destinationDir).let { kotlinOutput ->
project.files(kotlinTask.destinationDir, Kapt3KotlinGradleSubplugin.getKaptClasssesDir(project, getVariantName(variantData))) if (Kapt3GradleSubplugin.isEnabled(project))
// Add Kapt3 output as well, since there's no SyncOutputTask with the new API
kotlinOutput.from(Kapt3KotlinGradleSubplugin.getKaptClasssesDir(project, getVariantName(variantData)))
else
kotlinOutput
}
else else
// Don't register the output, but add the task to the pipeline // Don't register the output, but add the task to the pipeline
project.files() project.files()