From 4b0d8788731c5267a53f4fe7f08130fbb3d47db9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 18 Jan 2023 01:13:24 +0100 Subject: [PATCH] Change KaptFlag.USE_JVM_IR default value to true According to the comment on `Kapt3GradleSubplugin.BooleanOption` and the change in a7b1bade85. #KT-53135 --- .../src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt | 2 +- .../integration/AbstractKotlinKapt3IntegrationTestRunner.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt index e9ef5860f8c..3e59bb3edc2 100644 --- a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt +++ b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt @@ -126,7 +126,7 @@ enum class KaptFlag(val description: String, val defaultValue: Boolean = false) INCREMENTAL_APT("Incremental annotation processing (apt mode)"), STRIP_METADATA("Strip @Metadata annotations from stubs"), 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) ; } diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/integration/AbstractKotlinKapt3IntegrationTestRunner.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/integration/AbstractKotlinKapt3IntegrationTestRunner.kt index 5487652945c..76219e2cdf2 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/integration/AbstractKotlinKapt3IntegrationTestRunner.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/integration/AbstractKotlinKapt3IntegrationTestRunner.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.kapt3.test.integration 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.KaptContextBinaryArtifact import org.jetbrains.kotlin.kapt3.test.KaptEnvironmentConfigurator @@ -45,8 +46,8 @@ class AbstractKotlinKapt3IntegrationTestRunner( defaultDirectives { +KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS - if (targetBackend.isIR) { - +KaptTestDirectives.USE_JVM_IR + if (!targetBackend.isIR) { + KaptTestDirectives.DISABLED_FLAGS with KaptFlag.USE_JVM_IR } }