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

Change KaptFlag.USE_JVM_IR default value to true

Browse Source 
According to the comment on `Kapt3GradleSubplugin.BooleanOption` and the
change in a7b1bade85.

 #KT-53135
This commit is contained in:
Alexander Udalov
2023-01-18 01:13:24 +01:00
committed by Space Team
parent 574b9b76cd
commit 4b0d878873
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt
+1 -1
View File
@@ -126,7 +126,7 @@ enum class KaptFlag(val description: String, val defaultValue: Boolean = false)
INCREMENTAL_APT("Incremental annotation processing (apt mode)"), INCREMENTAL_APT("Incremental annotation processing (apt mode)"),
STRIP_METADATA("Strip @Metadata annotations from stubs"), STRIP_METADATA("Strip @Metadata annotations from stubs"),
KEEP_KDOC_COMMENTS_IN_STUBS("Keep KDoc comments in stubs", defaultValue = true), KEEP_KDOC_COMMENTS_IN_STUBS("Keep KDoc comments in stubs", defaultValue = true),
USE_JVM_IR("Use JVM IR backend") USE_JVM_IR("Use JVM IR backend", defaultValue = true)
; ;
} }
plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/integration/AbstractKotlinKapt3IntegrationTestRunner.kt
+3 -2
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.kapt3.test.integration package org.jetbrains.kotlin.kapt3.test.integration
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
import org.jetbrains.kotlin.base.kapt3.KaptFlag
import org.jetbrains.kotlin.kapt3.test.JvmCompilerWithKaptFacade import org.jetbrains.kotlin.kapt3.test.JvmCompilerWithKaptFacade
import org.jetbrains.kotlin.kapt3.test.KaptContextBinaryArtifact import org.jetbrains.kotlin.kapt3.test.KaptContextBinaryArtifact
import org.jetbrains.kotlin.kapt3.test.KaptEnvironmentConfigurator import org.jetbrains.kotlin.kapt3.test.KaptEnvironmentConfigurator
@@ -45,8 +46,8 @@ class AbstractKotlinKapt3IntegrationTestRunner(
defaultDirectives { defaultDirectives {
+KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS +KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS
if (targetBackend.isIR) { if (!targetBackend.isIR) {
+KaptTestDirectives.USE_JVM_IR KaptTestDirectives.DISABLED_FLAGS with KaptFlag.USE_JVM_IR
} }
} }