From a725d2efacc395bb43cd51fc233bdb9d2bbe6567 Mon Sep 17 00:00:00 2001 From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com> Date: Thu, 4 Apr 2024 20:18:33 +0700 Subject: [PATCH] desktop (windows): fix build (#3990) --- apps/multiplatform/common/build.gradle.kts | 4 +--- apps/multiplatform/desktop/build.gradle.kts | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts index 4cc5ced0d1..9a7b7fb2e3 100644 --- a/apps/multiplatform/common/build.gradle.kts +++ b/apps/multiplatform/common/build.gradle.kts @@ -12,9 +12,7 @@ version = extra["android.version_name"] as String kotlin { androidTarget() - jvm("desktop") { - jvmToolchain(11) - } + jvm("desktop") applyDefaultHierarchyTemplate() sourceSets { all { diff --git a/apps/multiplatform/desktop/build.gradle.kts b/apps/multiplatform/desktop/build.gradle.kts index c3dd9bb9b0..401c2938d5 100644 --- a/apps/multiplatform/desktop/build.gradle.kts +++ b/apps/multiplatform/desktop/build.gradle.kts @@ -12,10 +12,7 @@ version = extra["desktop.version_name"] as String kotlin { - jvm { - jvmToolchain(11) - withJava() - } + jvm() sourceSets { val jvmMain by getting { dependencies { @@ -151,7 +148,7 @@ cmake { tasks.named("clean") { dependsOn("cmakeClean") } -tasks.named("compileJava") { +tasks.named("compileKotlinJvm") { dependsOn("cmakeBuildAndCopy") } afterEvaluate {