azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[kotlin compiler] use one constants for version for all required kotlin artifacts

Browse Source
This commit is contained in:
Vasily Levchenko
2018-03-16 13:37:39 +03:00
committed by Vasily Levchenko
parent a37657127a
commit f4e9eba447
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+4 -4
View File
@@ -27,10 +27,10 @@ ext {
dependenciesDir = DependencyProcessor.defaultDependenciesRoot dependenciesDir = DependencyProcessor.defaultDependenciesRoot
platformManager = new PlatformManager(DistributionKt.buildDistribution(projectDir.absolutePath)) platformManager = new PlatformManager(DistributionKt.buildDistribution(projectDir.absolutePath))
kotlinCompilerModule="org.jetbrains.kotlin:kotlin-compiler:${kotlinCompilerVersion}" kotlinCompilerModule="org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}"
kotlinStdLibModule="org.jetbrains.kotlin:kotlin-stdlib:${kotlinStdLibVersion}" kotlinStdLibModule="org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinReflectVersion}" kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinScriptRuntimeVersion}" kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}"
} }
allprojects { allprojects {
gradle.properties
+1 -9
View File
@@ -21,15 +21,7 @@ remoteRoot=konan_tests
# Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_120_Compiler # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_120_Compiler
testDataVersion=1226829:id 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 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 kotlinVersion=1.2.40-dev-837
kotlinScriptRuntimeVersion=1.2.40-dev-837
kotlinStdLibVersion=1.2.40-dev-837
kotlinReflectVersion=1.2.40-dev-837
konanVersion=0.6.1 konanVersion=0.6.1
org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.jvmargs='-Dfile.encoding=UTF-8'
##
# required for performance mesuarement tasks
kotlinStdLibJdk8Version=1.2.40-dev-837
kotlinGradlePluginVersion=1.2.40-dev-837
performance/build.gradle
+2 -2
View File
@@ -7,7 +7,7 @@ buildscript {
} }
dependencies { 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" classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$konanVersion"
} }
} }
@@ -43,7 +43,7 @@ compileKotlin {
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinStdLibJdk8Version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
} }
task jvmRun(type: JavaExec) { task jvmRun(type: JavaExec) {