build: Rename kotlin version properties

kotlin_version -> buildKotlinVersion
kotlinVersion -> kotlinCompilerVersion

Interop/Indexer/build.gradle

@@ -91,7 +91,7 @@ sourceSets {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile project(':Interop:Runtime')
 }
 

Interop/Runtime/build.gradle

@@ -44,8 +44,8 @@ model {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-reflect:$buildKotlinVersion"
 }
 
 sourceSets.main.kotlin.srcDirs += "src/jvm/kotlin"

Interop/StubGenerator/build.gradle

@@ -24,7 +24,7 @@ apply plugin: 'application'
 mainClassName = "org.jetbrains.kotlin.native.interop.gen.jvm.MainKt"
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile project(':Interop:Indexer')
     compile project(':shared')
 }

backend.native/build.gradle

@@ -145,7 +145,7 @@ dependencies {
     compilerCompile kotlinNativeInterop['hash'].configuration
     compilerCompile project(':shared')
 
-    cli_bcCompile "org.jetbrains.kotlin:kotlin-runtime:$kotlin_version"
+    cli_bcCompile "org.jetbrains.kotlin:kotlin-runtime:$buildKotlinVersion"
     cli_bcCompile project(':shared')
     cli_bcCompile sourceSets.compiler.output
 

backend.native/debugger-tests/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile project(path: ':backend.native', configuration: 'cli_bc')
     compile project(':shared')
     compile 'junit:junit:4.12'

build.gradle

@@ -29,7 +29,7 @@ ext {
     distDir = file('dist')
     dependenciesDir = DependencyProcessor.defaultDependenciesRoot
     clangManager = new ClangManager(konanProperties, dependenciesDir.absolutePath)
-    kotlinCompilerModule="org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}"
+    kotlinCompilerModule="org.jetbrains.kotlin:kotlin-compiler:${kotlinCompilerVersion}"
     kotlinStdLibModule="org.jetbrains.kotlin:kotlin-stdlib:${kotlinStdLibVersion}"
     kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinReflectVersion}"
     kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinScriptRuntimeVersion}"

buildSrc/shared/build.gradle

@@ -18,7 +18,7 @@ buildscript {
     ext {
         gradleProperties = new Properties()
         gradleProperties.load(new FileInputStream("$projectDir/../../gradle.properties"))
-        kotlin_version = gradleProperties."kotlin_version"
+        buildKotlinVersion = gradleProperties."buildKotlinVersion"
     }
 
     apply from: '../../gradle/kotlinGradlePlugin.gradle'
@@ -30,7 +30,7 @@ apply plugin: 'kotlin'
 sourceSets.main.kotlin.srcDirs = ["$projectDir/../../shared"]
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
 }
 
 rootProject.dependencies {

dependencies/upload.gradle

@@ -17,7 +17,7 @@ apply plugin: 'com.jfrog.bintray'
 
 def versionMapping = [
        'kotlin-script-runtime' : kotlinScriptRuntimeVersion,
-       'kotlin-compiler'       : kotlinVersion,
+       'kotlin-compiler'       : kotlinCompilerVersion,
        'kotlin-stdlib'         : kotlinStdLibVersion,
        'kotlin-reflect'        : kotlinReflectVersion,
        'kotlin-stdlib-jre8'    : kotlinStdLibJdk8Version

gradle.properties

@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-kotlin_version=1.1.4
+# A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script.
+buildKotlinVersion=1.1.4
 llvmVersion = 3.9.0
 remoteRoot=konan_tests
 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT
@@ -23,7 +24,7 @@ testDataVersion=1226829:id
 kotlinCompilerRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies
 #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots
 #kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev
-kotlinVersion=1.2-20171124.204021-51
+kotlinCompilerVersion=1.2-20171124.204021-51
 kotlinScriptRuntimeVersion=1.2-20171124.204038-51
 kotlinStdLibVersion=1.2-20171124.204041-51
 kotlinReflectVersion=1.2-20171124.204033-51

gradle/kotlinGradlePlugin.gradle

@@ -1,5 +1,5 @@
-if (!hasProperty('kotlin_version')) {
+if (!hasProperty('buildKotlinVersion')) {
-    throw new GradleException('Please ensure the "kotlin_version" property is defined before applying this script.')
+    throw new GradleException('Please ensure the "buildKotlinVersion" property is defined before applying this script.')
 }
 
 project.buildscript.repositories {
@@ -7,5 +7,5 @@ project.buildscript.repositories {
 }
 
 project.buildscript.dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$buildKotlinVersion"
 }

klib/build.gradle

@@ -21,6 +21,6 @@ buildscript {
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile project(path: ':backend.native', configuration: 'cli_bc')
 }

shared/build.gradle

@@ -21,5 +21,5 @@ buildscript {
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
 }

tools/kotlin-native-gradle-plugin/build.gradle

@@ -61,7 +61,7 @@ task pluginMetadata {
 
 dependencies {
     compile project(':shared')
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile gradleApi()
 
     testCompile gradleTestKit()
@@ -103,7 +103,7 @@ publishing {
                 def stdlibDep = xml.asNode().appendNode("dependencies").appendNode("dependency")
                 stdlibDep.appendNode("groupId", "org.jetbrains.kotlin")
                 stdlibDep.appendNode("artifactId", "kotlin-stdlib")
-                stdlibDep.appendNode("version", "$kotlin_version")
+                stdlibDep.appendNode("version", "$buildKotlinVersion")
             }
         }
     }

utilities/build.gradle

@@ -21,7 +21,7 @@ buildscript {
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile project(':backend.native')
     compile project(':Interop:StubGenerator')
     compile project(':klib')