Configuration: Restore dependency on gradle plugin in buildscript block
#KT-24671 Fixed
This commit is contained in:
+2
@@ -121,6 +121,8 @@ abstract class GradleKotlinFrameworkSupportProvider(
|
|||||||
|
|
||||||
if (useNewSyntax) {
|
if (useNewSyntax) {
|
||||||
updateSettingsScript(module) { updateSettingsScript(it, specifyPluginVersionIfNeeded) }
|
updateSettingsScript(module) { updateSettingsScript(it, specifyPluginVersionIfNeeded) }
|
||||||
|
} else {
|
||||||
|
buildScriptData.addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
@@ -267,6 +267,8 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
|
|||||||
val GROUP_ID = "org.jetbrains.kotlin"
|
val GROUP_ID = "org.jetbrains.kotlin"
|
||||||
val GRADLE_PLUGIN_ID = "kotlin-gradle-plugin"
|
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_BUILD_SCRIPT_NAME = "build.gradle.kts"
|
||||||
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
|
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
|
||||||
|
|
||||||
|
|||||||
+2
@@ -272,6 +272,8 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
|
|||||||
val GROUP_ID = "org.jetbrains.kotlin"
|
val GROUP_ID = "org.jetbrains.kotlin"
|
||||||
val GRADLE_PLUGIN_ID = "kotlin-gradle-plugin"
|
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_BUILD_SCRIPT_NAME = "build.gradle.kts"
|
||||||
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
|
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
|
||||||
|
|
||||||
|
|||||||
+2
@@ -272,6 +272,8 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
|
|||||||
val GROUP_ID = "org.jetbrains.kotlin"
|
val GROUP_ID = "org.jetbrains.kotlin"
|
||||||
val GRADLE_PLUGIN_ID = "kotlin-gradle-plugin"
|
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_BUILD_SCRIPT_NAME = "build.gradle.kts"
|
||||||
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
|
private val KOTLIN_SETTINGS_SCRIPT_NAME = "settings.gradle.kts"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user