Kapt, Refactoring: Introduce 'KaptOptions'

1. Use 'KaptOptions' for all kapt options, including paths and flags.
2. Use a single 'KAPT_OPTIONS' compiler configuration key for setting all options (using a mutable KaptOptions.Builder).
3. Pass 'KaptOptions' instead of separate flags.
4. Remove 'KaptPaths'.
5. Remove deprecated 'aptOnly' CLI option.
This commit is contained in:
Yan Zhulanow
2018-11-06 15:30:34 +09:00
parent a621171d9b
commit 7e4069f114
17 changed files with 457 additions and 489 deletions
+8 -11
View File
@@ -6,7 +6,8 @@
package org.jetbrains.kotlin.kapt.base.test
import junit.framework.TestCase
import org.jetbrains.kotlin.kapt3.base.KaptPaths
import org.jetbrains.kotlin.base.kapt3.KaptOptions
import org.jetbrains.kotlin.base.kapt3.collectJavaSourceFiles
import org.junit.Test
import java.io.File
import java.nio.file.Files
@@ -36,16 +37,12 @@ class KaptPathsTest : TestCase() {
val javaRoots = listOf(simpleJava, symlinkToOtherJava, symlinkToNotJava, symlinkToJavaRootDir, javaRootDir)
val paths = KaptPaths(
projectBaseDir = null,
compileClasspath = emptyList(),
annotationProcessingClasspath = emptyList(),
javaSourceRoots = javaRoots,
sourcesOutputDir = outputDir,
classFilesOutputDir = outputDir,
stubsOutputDir = outputDir,
incrementalDataOutputDir = null
)
val paths = KaptOptions.Builder().apply {
javaSourceRoots.addAll(javaRoots)
sourcesOutputDir = outputDir
classesOutputDir = outputDir
stubsOutputDir = outputDir
}.build()
val javaSourceFiles = paths.collectJavaSourceFiles()