Skip to content

Commit 11b2d5a

Browse files
committed
Build scripts: use setupKotlinPlugin task name
1 parent 3b952ea commit 11b2d5a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</condition>
1818
<exec executable="${gradle.executable}" dir="${project.home}/build/dependencies" failonerror="true">
1919
<arg value="--no-daemon"/>
20-
<arg value="setupKotlin"/>
20+
<arg value="setupKotlinPlugin"/>
2121
</exec>
2222
<propertyset id="intellij.build.properties">
2323
<propertyref name="build.number"/>

build/scripts/utils.gant

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ binding.setVariable("loadProject", {
110110
bundledKotlinPath = "$home/community/build/dependencies/build/kotlin/Kotlin/kotlinc"
111111
}
112112
if (!new File(bundledKotlinPath, "lib/kotlin-runtime.jar").exists()) {
113-
projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-runtime.jar: run `./gradlew setupKotlin` in dependencies module to download Kotlin JARs")
113+
projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-runtime.jar: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
114114
return
115115
}
116116
setPathVariable("KOTLIN_BUNDLED", bundledKotlinPath)
@@ -159,7 +159,7 @@ private boolean ensureKotlinCompilerAddedToClassPath() {
159159
kotlinPluginLibPath = "$home/community/build/dependencies/build/kotlin/Kotlin/lib"
160160
}
161161
if (!new File(kotlinPluginLibPath, "kotlin-runtime.jar").exists()) {
162-
projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlin` in dependencies module " +
162+
projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module " +
163163
"to download Kotlin JARs")
164164
return false
165165
}

build/update.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</condition>
3131
<exec executable="${gradle.executable}" dir="${project.home}/build/dependencies" failonerror="true">
3232
<arg value="--no-daemon"/>
33-
<arg value="setupKotlin"/>
33+
<arg value="setupKotlinPlugin"/>
3434
</exec>
3535
<java failonerror="true" classname="org.apache.tools.ant.Main" fork="true">
3636
<jvmarg line="-Xms64m -Xmx512m"/>

platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class CompilationContextImpl implements CompilationContext {
146146
}
147147
else {
148148
messages.error(
149-
"Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlin` in dependencies module to download Kotlin JARs")
149+
"Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
150150
}
151151
}
152152

0 commit comments

Comments
 (0)