Clarify Kotlin Versions and config in project

1 files changed, 17 insertions, 9 deletions

diff --git a/core/build.gradle b/core/build.gradle
index 68d3da89..a8f0f275 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -2,26 +2,34 @@ import javax.tools.ToolProvider
 
 buildscript {
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_compiler_to_compile_core_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 apply plugin: 'kotlin'
 
-sourceCompatibility = 1.6
+sourceCompatibility = 1.8
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        languageVersion = "1.2"
+        apiVersion = languageVersion
+        jvmTarget = "1.8"
+    }
+}
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_compiler_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_compiler_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$bundled_kotlin_compiler_version"
+    compile "org.jetbrains.kotlin:kotlin-reflect:$bundled_kotlin_compiler_version"
 
     compile group: 'com.google.inject', name: 'guice', version: '3.0'
     compile "org.jsoup:jsoup:1.8.3"
 
-    compile "org.jetbrains.kotlin:kotlin-compiler:$kotlin_compiler_version"
-    compile "org.jetbrains.kotlin:kotlin-script-runtime:$kotlin_compiler_version"
+    compile "org.jetbrains.kotlin:kotlin-compiler:$bundled_kotlin_compiler_version"
+    compile "org.jetbrains.kotlin:kotlin-script-runtime:$bundled_kotlin_compiler_version"
 
-    compile "teamcity:kotlin-ide-common:$kotlin_compiler_version"
-    compile "teamcity:markdown:$kotlin_compiler_version"
+    compile "teamcity:kotlin-ide-common:$bundled_kotlin_compiler_version"
+    compile "teamcity:markdown:$bundled_kotlin_compiler_version"
 
     compile intellijCoreAnalysis()
 
@@ -33,7 +41,7 @@ dependencies {
     compile project(":integration")
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_compiler_to_compile_core_version
+    testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_version
     testCompile "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
 
     testCompile ideaRT()