diff --git a/Interop/Indexer/build.gradle b/Interop/Indexer/build.gradle index b064fe4bbd1..5f700d9f4a9 100644 --- a/Interop/Indexer/build.gradle +++ b/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') } diff --git a/Interop/Runtime/build.gradle b/Interop/Runtime/build.gradle index 7ce6763ca9f..358c47cabc5 100644 --- a/Interop/Runtime/build.gradle +++ b/Interop/Runtime/build.gradle @@ -44,8 +44,8 @@ model { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-reflect:$buildKotlinVersion" } sourceSets.main.kotlin.srcDirs += "src/jvm/kotlin" diff --git a/Interop/StubGenerator/build.gradle b/Interop/StubGenerator/build.gradle index 0af4c5cef90..9bb10af6bc4 100644 --- a/Interop/StubGenerator/build.gradle +++ b/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') } diff --git a/backend.native/build.gradle b/backend.native/build.gradle index 643e8562f94..4ffaab92768 100644 --- a/backend.native/build.gradle +++ b/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 diff --git a/backend.native/debugger-tests/build.gradle b/backend.native/debugger-tests/build.gradle index 4c71dbfef82..3ccb9229a67 100644 --- a/backend.native/debugger-tests/build.gradle +++ b/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' diff --git a/build.gradle b/build.gradle index 4098943fc6b..a0a8e2405fa 100644 --- a/build.gradle +++ b/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}" diff --git a/buildSrc/shared/build.gradle b/buildSrc/shared/build.gradle index 931fd8b96f2..ee04469f324 100644 --- a/buildSrc/shared/build.gradle +++ b/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 { diff --git a/dependencies/upload.gradle b/dependencies/upload.gradle index 39851c03bc5..10606cbaac7 100644 --- a/dependencies/upload.gradle +++ b/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 diff --git a/gradle.properties b/gradle.properties index 6597e10cb4a..91522b4875d 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/kotlinGradlePlugin.gradle b/gradle/kotlinGradlePlugin.gradle index e5590e3c633..a2b1d3afd67 100644 --- a/gradle/kotlinGradlePlugin.gradle +++ b/gradle/kotlinGradlePlugin.gradle @@ -1,5 +1,5 @@ -if (!hasProperty('kotlin_version')) { - throw new GradleException('Please ensure the "kotlin_version" property is defined before applying this script.') +if (!hasProperty('buildKotlinVersion')) { + 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" } diff --git a/klib/build.gradle b/klib/build.gradle index 1ccee49785e..a17a8b4b6a0 100644 --- a/klib/build.gradle +++ b/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') } \ No newline at end of file diff --git a/shared/build.gradle b/shared/build.gradle index 8cde6c626d8..1913c8a044c 100644 --- a/shared/build.gradle +++ b/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" } diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle index 3ef8425dfb4..72ef09fe9b7 100644 --- a/tools/kotlin-native-gradle-plugin/build.gradle +++ b/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") } } } diff --git a/utilities/build.gradle b/utilities/build.gradle index 842903e1086..755721ac1e8 100644 --- a/utilities/build.gradle +++ b/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')