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

[KAPT] Fix package names org.jetbrains.kotlin.base.kapt3 -> org.jetbrains.kotlin.kapt3.base

Browse Source
This commit is contained in:
strangepleasures
2023-09-15 19:36:30 +00:00
committed by Space Team
parent b4209a4196
commit c31a3869c6
27 changed files with 41 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt
+1 -1
View File
@@ -193,7 +193,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
/**
* Kapt option that expects a Boolean value. It has a default value to be used when its value is not set.
*
* IMPORTANT: The default value should typically match those defined in org.jetbrains.kotlin.base.kapt3.KaptFlag.
* IMPORTANT: The default value should typically match those defined in org.jetbrains.kotlin.kapt3.base.KaptFlag.
*/
private enum class BooleanOption(
val optionName: String,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt
+12 -7
View File
@@ -280,7 +280,12 @@ private class KaptExecution @Inject constructor(
private companion object {
private const val JAVAC_CONTEXT_CLASS = "com.sun.tools.javac.util.Context"
private fun kaptClass(classLoader: ClassLoader) = Class.forName("org.jetbrains.kotlin.kapt3.base.Kapt", true, classLoader)
private fun ClassLoader.kaptClass(simpleName: String): Class<*> =
try {
Class.forName("org.jetbrains.kotlin.kapt3.base.$simpleName", true, this)
} catch (_: ClassNotFoundException) { // in case we have an old plugin version on the classpath
Class.forName("org.jetbrains.kotlin.base.kapt3.$simpleName", true, this)
}
private var classLoadersCache: ClassLoadersCache? = null
@@ -309,7 +314,7 @@ private class KaptExecution @Inject constructor(
classLoadersCache = ClassLoadersCache(classloadersCacheSize, kaptClassLoader)
}
val kaptMethod = kaptClass(kaptClassLoader).declaredMethods.single { it.name == "kapt" }
val kaptMethod = kaptClassLoader.kaptClass("Kapt").declaredMethods.single { it.name == "kapt" }
kaptMethod.invoke(null, createKaptOptions(kaptClassLoader))
}
@@ -321,13 +326,13 @@ private class KaptExecution @Inject constructor(
}
}
private fun createKaptOptions(classLoader: ClassLoader) = with(optionsForWorker) {
val flags = kaptClass(classLoader).declaredMethods.single { it.name == "kaptFlags" }.invoke(null, flags)
private fun createKaptOptions(classLoader: ClassLoader): Any = with(optionsForWorker) {
val flags = classLoader.kaptClass("Kapt").declaredMethods.single { it.name == "kaptFlags" }.invoke(null, flags)
val mode = Class.forName("org.jetbrains.kotlin.base.kapt3.AptMode", true, classLoader)
val mode = classLoader.kaptClass("AptMode")
.enumConstants.single { (it as Enum<*>).name == "APT_ONLY" }
val detectMemoryLeaksMode = Class.forName("org.jetbrains.kotlin.base.kapt3.DetectMemoryLeaksMode", true, classLoader)
val detectMemoryLeaksMode = classLoader.kaptClass("DetectMemoryLeaksMode")
.enumConstants.single { (it as Enum<*>).name == "NONE" }
//in case cache was enabled and then disabled
@@ -339,7 +344,7 @@ private class KaptExecution @Inject constructor(
null
}
Class.forName("org.jetbrains.kotlin.base.kapt3.KaptOptions", true, classLoader).constructors.single().newInstance(
classLoader.kaptClass("KaptOptions").constructors.single().newInstance(
projectBaseDir,
compileClasspath,
javaSourceRoots,