From 23ed4f70b743a486412c988940ea91619d34db21 Mon Sep 17 00:00:00 2001 From: Dmitrii Krasnov Date: Fri, 28 Mar 2025 15:54:56 +0100 Subject: [PATCH] Fixes for KT-75970 --- .../kotlin-compiler-server-version-catalog.settings.gradle.kts | 2 ++ common/src/main/kotlin/component/KotlinEnvironment.kt | 1 + 2 files changed, 3 insertions(+) diff --git a/build-settings-logic/src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts b/build-settings-logic/src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts index ca15b9ef..79999d52 100644 --- a/build-settings-logic/src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts +++ b/build-settings-logic/src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts @@ -2,6 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() + mavenLocal() val additionalRepositoryProperty = providers.gradleProperty("kotlin_repo_url") if (additionalRepositoryProperty.isPresent) { @@ -21,6 +22,7 @@ dependencyResolutionManagement { repositories { mavenCentral() gradlePluginPortal() + mavenLocal() val additionalRepositoryProperty = providers.gradleProperty("kotlin_repo_url") if (additionalRepositoryProperty.isPresent) { diff --git a/common/src/main/kotlin/component/KotlinEnvironment.kt b/common/src/main/kotlin/component/KotlinEnvironment.kt index b9cfab63..96b0ff06 100644 --- a/common/src/main/kotlin/component/KotlinEnvironment.kt +++ b/common/src/main/kotlin/component/KotlinEnvironment.kt @@ -3,6 +3,7 @@ package component import com.intellij.openapi.util.Disposer import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments +import org.jetbrains.kotlin.cli.common.arguments.toLanguageVersionSettings import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment