From f4feb71ad28ad192144accadfc0904aed34c07ea Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 28 Dec 2017 15:48:54 +0100 Subject: [PATCH] Extract repeated versions to a single location --- build.gradle.kts | 8 +++++--- buildSrc/build.gradle.kts | 7 ++++--- versions.gradle.kts | 4 ++++ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 versions.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 8b6bf23ef8f..69d69276231 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ + import org.gradle.api.Project import java.util.* import java.io.File @@ -113,8 +114,10 @@ extra["JDK_17"] = jdkPath("1.7") extra["JDK_18"] = jdkPath("1.8") extra["JDK_9"] = jdkPathIfFound("9") -extra["versions.intellijSdk"] = "172.4343.14" -extra["versions.androidBuildTools"] = "r23.0.1" +rootProject.apply { + from(rootProject.file("versions.gradle.kts")) +} + extra["versions.protobuf-java"] = "2.6.1" extra["versions.javax.inject"] = "1" extra["versions.jsr305"] = "1.3.9" @@ -131,7 +134,6 @@ extra["versions.native-platform"] = "0.14" extra["versions.ant-launcher"] = "1.8.0" extra["versions.robolectric"] = "3.1" extra["versions.org.springframework"] = "4.2.0.RELEASE" -extra["versions.idea.NodeJS"] = "172.3757.32" extra["versions.jflex"] = "1.7.0" val markdownVer = "4054 - Kotlin 1.0.2-dev-566".replace(" ", "%20") // fixed here, was last with "status:SUCCESS,tag:forKotlin" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 116f6e1fc40..62d809332b6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -37,6 +37,10 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name) else v.toBoolean() } +rootProject.apply { + from(rootProject.file("../versions.gradle.kts")) +} + val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null @@ -45,10 +49,7 @@ extra["intellijUltimateEnabled"] = intellijUltimateEnabled extra["intellijSeparateSdks"] = intellijSeparateSdks extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository" extra["intellijReleaseType"] = "releases" // or "snapshots" -extra["versions.intellijSdk"] = "172.4343.14" -extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.androidDxSources"] = "5.0.0_r2" -extra["versions.idea.NodeJS"] = "172.3757.32" extra["customDepsRepo"] = "$rootDir/repo" extra["customDepsOrg"] = "kotlin.build.custom.deps" diff --git a/versions.gradle.kts b/versions.gradle.kts new file mode 100644 index 00000000000..802bfc192b3 --- /dev/null +++ b/versions.gradle.kts @@ -0,0 +1,4 @@ + +extra["versions.intellijSdk"] = "173.4127.27" +extra["versions.androidBuildTools"] = "r23.0.1" +extra["versions.idea.NodeJS"] = "172.3757.32"