From b10f47b50e5d944a820079cc29ef44dbd5a4ac4a Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Wed, 20 Nov 2019 11:41:16 +0300 Subject: [PATCH] Minor: merge util methods for scripting to one file in idea-gradle --- .../KotlinGradleBuildScriptsResolver.kt | 4 ++-- .../KotlinGradleBuildScriptsResolver.kt.193 | 4 ++-- .../kotlin/idea/scripting/gradle/utils.kt | 7 +++++++ .../org/jetbrains/kotlin/idea/scripting/util.kt | 14 -------------- 4 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/util.kt diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt index f2e4b6a8dc5..49d8f5f1439 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt @@ -12,8 +12,8 @@ import com.intellij.util.Consumer import org.gradle.tooling.model.idea.IdeaProject import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.* import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel -import org.jetbrains.kotlin.idea.scripting.minimal_gradle_version_supported -import org.jetbrains.kotlin.idea.scripting.shouldLoadDependenciesDuringImport +import org.jetbrains.kotlin.idea.scripting.gradle.minimal_gradle_version_supported +import org.jetbrains.kotlin.idea.scripting.gradle.shouldLoadDependenciesDuringImport import org.jetbrains.plugins.gradle.model.ProjectImportExtraModelProvider import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt.193 index 1ff255b13b1..771081115df 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt.193 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt.193 @@ -12,8 +12,8 @@ import com.intellij.util.Consumer import org.gradle.tooling.model.idea.IdeaProject import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.* import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel -import org.jetbrains.kotlin.idea.scripting.minimal_gradle_version_supported -import org.jetbrains.kotlin.idea.scripting.shouldLoadDependenciesDuringImport +import org.jetbrains.kotlin.idea.scripting.gradle.minimal_gradle_version_supported +import org.jetbrains.kotlin.idea.scripting.gradle.shouldLoadDependenciesDuringImport import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt index 882fd9b72ad..fc5b29c306e 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.scripting.gradle import com.intellij.openapi.project.Project +import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiElement import com.intellij.psi.PsiManager @@ -56,4 +57,10 @@ fun getGradleScriptInputsStamp( GradleKotlinScriptConfigurationInputs(result.toString()) } else null } +} + +const val minimal_gradle_version_supported = "6.0" + +fun shouldLoadDependenciesDuringImport(): Boolean { + return Registry.`is`("kotlin.gradle.scripts.useIdeaProjectImport", false) } \ No newline at end of file diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/util.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/util.kt deleted file mode 100644 index 1d677439297..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/util.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.scripting - -import com.intellij.openapi.util.registry.Registry - -const val minimal_gradle_version_supported = "6.0" - -fun shouldLoadDependenciesDuringImport(): Boolean { - return Registry.`is`("kotlin.gradle.scripts.useIdeaProjectImport", false) -} \ No newline at end of file