Build: Allow intellijUltimateEnabled without kotlin-ultimate directory

This allows to build against idea ultimate locally
This commit is contained in:
Vyacheslav Gerasimov
2020-07-15 19:05:25 +03:00
parent 34c1316ae0
commit 996e529944
6 changed files with 7 additions and 13 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ buildscript {
dependencies { dependencies {
bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion)) bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17") classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
classpath(kotlin("gradle-plugin", bootstrapKotlinVersion)) classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17") classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
} }
+2 -2
View File
@@ -22,7 +22,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17") classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}") classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
} }
@@ -97,7 +97,7 @@ repositories {
dependencies { dependencies {
implementation(kotlin("stdlib", embeddedKotlinVersion)) implementation(kotlin("stdlib", embeddedKotlinVersion))
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17") implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
implementation("com.gradle.publish:plugin-publish-plugin:0.11.0") implementation("com.gradle.publish:plugin-publish-plugin:0.11.0")
implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}") implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
+1 -1
View File
@@ -20,7 +20,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17") classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
} }
} }
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
} }
group = "org.jetbrains.kotlin" group = "org.jetbrains.kotlin"
version = "0.0.17" version = "0.0.18"
repositories { repositories {
mavenCentral() mavenCentral()
@@ -67,13 +67,7 @@ class KotlinBuildProperties(
val isTeamcityBuild: Boolean = getBoolean("teamcity") || System.getenv("TEAMCITY_VERSION") != null val isTeamcityBuild: Boolean = getBoolean("teamcity") || System.getenv("TEAMCITY_VERSION") != null
val intellijUltimateEnabled: Boolean val intellijUltimateEnabled: Boolean
get() { get() = getBoolean("intellijUltimateEnabled", isTeamcityBuild)
val explicitlyEnabled = getBoolean("intellijUltimateEnabled")
if (!kotlinUltimateExists && explicitlyEnabled) {
error("intellijUltimateEnabled property is set, while kotlin-ultimate repository is not provided")
}
return kotlinUltimateExists && (explicitlyEnabled || isTeamcityBuild)
}
val includeCidrPlugins: Boolean = kotlinUltimateExists && getBoolean("cidrPluginsEnabled") val includeCidrPlugins: Boolean = kotlinUltimateExists && getBoolean("cidrPluginsEnabled")
+1 -1
View File
@@ -27,7 +27,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17") classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
} }
} }