From 79a80ce8de869419a90e4d565d09513240b52b80 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Wed, 11 Jul 2018 14:30:00 +0300
Subject: [PATCH] Use new syntax for '.gradle.kts' files in
 AddKotlinLibQuickFix

^KT-25403 Fixed
---
 .../configuration/KotlinBuildScriptManipulator.kt     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt
index 5b3162bbad5..4d6b4c7dab3 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt
@@ -119,9 +119,14 @@ class KotlinBuildScriptManipulator(
         libraryDescriptor: ExternalLibraryDescriptor,
         isAndroidModule: Boolean
     ) {
-        val kotlinLibraryVersion = libraryDescriptor.maxVersion.let {
-            if (it == GSK_KOTLIN_VERSION_PROPERTY_NAME) "\$$it" else it
-        }
+        val kotlinLibraryVersion = libraryDescriptor.maxVersion
+            .takeIf {
+                !useNewSyntax(if (isAndroidModule) "kotlin-android" else KotlinGradleModuleConfigurator.KOTLIN)
+            }
+            .let {
+                if (it == GSK_KOTLIN_VERSION_PROPERTY_NAME) "\$$it" else it
+            }
+
         scriptFile.getDependenciesBlock()?.apply {
             addExpressionIfMissing(
                 getCompileDependencySnippet(