Configuration: Restore dependency on gradle plugin in buildscript block

#KT-24671 Fixed
This commit is contained in:
Alexey Sedunov
2018-05-29 17:47:52 +03:00
parent cbcc3d2e2e
commit 6f8e25eae7
4 changed files with 8 additions and 0 deletions
@@ -121,6 +121,8 @@ abstract class GradleKotlinFrameworkSupportProvider(
if (useNewSyntax) {
updateSettingsScript(module) { updateSettingsScript(it, specifyPluginVersionIfNeeded) }
} else {
buildScriptData.addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH)
}
}
@@ -267,6 +267,8 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
val GROUP_ID = "org.jetbrains.kotlin"
val GRADLE_PLUGIN_ID = "kotlin-gradle-plugin"
val CLASSPATH = "classpath \"$GROUP_ID:$GRADLE_PLUGIN_ID:\$kotlin_version\""
private val KOTLIN_BUILD_SCRIPT_NAME = "build.gradle.kts"
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
@@ -272,6 +272,8 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
val GROUP_ID = "org.jetbrains.kotlin"
val GRADLE_PLUGIN_ID = "kotlin-gradle-plugin"
val CLASSPATH = "classpath \"$GROUP_ID:$GRADLE_PLUGIN_ID:\$kotlin_version\""
private val KOTLIN_BUILD_SCRIPT_NAME = "build.gradle.kts"
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
@@ -272,6 +272,8 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
val GROUP_ID = "org.jetbrains.kotlin"
val GRADLE_PLUGIN_ID = "kotlin-gradle-plugin"
val CLASSPATH = "classpath \"$GROUP_ID:$GRADLE_PLUGIN_ID:\$kotlin_version\""
private val KOTLIN_BUILD_SCRIPT_NAME = "build.gradle.kts"
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"