diff --git a/build.gradle b/build.gradle index 2cd35cb60b4..a643bc310d9 100644 --- a/build.gradle +++ b/build.gradle @@ -27,10 +27,10 @@ ext { dependenciesDir = DependencyProcessor.defaultDependenciesRoot platformManager = new PlatformManager(DistributionKt.buildDistribution(projectDir.absolutePath)) - 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}" + kotlinCompilerModule="org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}" + kotlinStdLibModule="org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" + kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}" + kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}" } allprojects { diff --git a/gradle.properties b/gradle.properties index 5fa6087181a..960416bd36c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,15 +21,7 @@ remoteRoot=konan_tests # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_120_Compiler testDataVersion=1226829:id kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.40-dev-837/artifacts/content/maven -kotlinCompilerVersion=1.2.40-dev-837 -kotlinScriptRuntimeVersion=1.2.40-dev-837 -kotlinStdLibVersion=1.2.40-dev-837 -kotlinReflectVersion=1.2.40-dev-837 +kotlinVersion=1.2.40-dev-837 konanVersion=0.6.1 org.gradle.jvmargs='-Dfile.encoding=UTF-8' -## -# required for performance mesuarement tasks - -kotlinStdLibJdk8Version=1.2.40-dev-837 -kotlinGradlePluginVersion=1.2.40-dev-837 diff --git a/performance/build.gradle b/performance/build.gradle index 4c6754fbe5b..376a62a3d5a 100644 --- a/performance/build.gradle +++ b/performance/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinGradlePluginVersion" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$konanVersion" } } @@ -43,7 +43,7 @@ compileKotlin { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinStdLibJdk8Version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" } task jvmRun(type: JavaExec) {