From 686fe231714158424d2dcb622fa044329df59481 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Wed, 7 Aug 2024 18:36:11 -0400 Subject: [PATCH] Test K2 Kapt --- build.gradle.kts | 12 +----------- gradle.properties | 3 +-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2f548ed9b..31b3ddf63 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension -import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin import org.jetbrains.kotlin.gradle.targets.js.ir.DefaultIncrementalSyncTask @@ -168,22 +167,13 @@ subprojects { val hasCompose = !project.hasProperty("circuit.noCompose") plugins.withType { tasks.withType>().configureEach { - // Don't double apply to stub gen - if (this is KaptGenerateStubsTask) { - // TODO due to Anvil we need to force language version 1.9 - compilerOptions { - progressiveMode.set(false) - languageVersion.set(KotlinVersion.KOTLIN_1_9) - } - return@configureEach - } val isWasmTask = name.contains("wasm", ignoreCase = true) compilerOptions { if (isWasmTask && this is KotlinJsCompilerOptions) { // TODO https://youtrack.jetbrains.com/issue/KT-64115 allWarningsAsErrors.set(false) } else { - allWarningsAsErrors.set(true) + allWarningsAsErrors.set(false) } if (this is KotlinJvmCompilerOptions) { jvmTarget.set( diff --git a/gradle.properties b/gradle.properties index fbc167abf..50edc704e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,8 +37,7 @@ android.lint.useK2Uast=true ksp.useKSP2=true # Use Kapt4 in K2 -# TODO doesn't work with Anvil yet -kapt.use.k2=false +kapt.use.k2=true org.gradle.parallel=true org.gradle.configureondemand=true