diff --git a/build.gradle b/build.gradle
index e4beabfc745..3f4b4c91b96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,11 @@ import org.jetbrains.kotlin.konan.*
 
 buildscript {
     apply from: "gradle/kotlinGradlePlugin.gradle"
+
+    repositories {
+        maven { url kotlinCompilerRepo }
+    }
+
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
     }
@@ -53,12 +58,12 @@ ext {
     kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
     kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}"
 
-    konanVersionFull = KonanVersion.Companion.CURRENT
+    konanVersionFull = KonanVersionGeneratedKt.getCurrentKonanVersion()
 
     if (konanVersionFull.meta == MetaVersion.RELEASE) {
         gradlePluginVersion = kotlinVersion
     } else {
-        gradlePluginVersion = "$kotlinVersion-native-${KonanVersion.Companion.CURRENT.toString()}"
+        gradlePluginVersion = "$kotlinVersion-native-$konanVersionFull"
     }
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d0dc1e78566..90b0cd9e375 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -22,11 +22,13 @@ buildscript {
 }
 
 val buildKotlinCompilerRepo: String by project
+val kotlinCompilerRepo: String by project
 
 val repos = listOf(
     buildKotlinCompilerRepo,
+    kotlinCompilerRepo,
     "https://cache-redirector.jetbrains.com/maven-central",
-    "https://kotlin.bintray.com/kotlinx",
+    "https://kotlin.bintray.com/kotlinx"
 )
 
 allprojects {
diff --git a/buildSrc/shared/build.gradle b/buildSrc/shared/build.gradle
index 1507eb816bc..bee13ca01d6 100644
--- a/buildSrc/shared/build.gradle
+++ b/buildSrc/shared/build.gradle
@@ -30,15 +30,15 @@ apply plugin: 'kotlin'
 // We reuse the source code from the Project in buildSrc.
 sourceSets.main.kotlin.srcDirs = ["$projectDir/../../shared/src/main/kotlin"]
 
-repositories {
-    maven {
-        url buildKotlinCompilerRepo
-    }
-}
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
+    compile "org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion"
 }
 
 rootProject.dependencies {
     runtime project(path)
 }
+
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
\ No newline at end of file
diff --git a/platformLibs/build.gradle b/platformLibs/build.gradle
index 1edffc1956a..c456491bead 100644
--- a/platformLibs/build.gradle
+++ b/platformLibs/build.gradle
@@ -36,7 +36,7 @@ private ArrayList<DefFile> targetDefFiles(KonanTarget  target) {
             // Just workaround it until we have sysroots corrected.
             .findAll { ! ((target instanceof KonanTarget.LINUX_MIPS32 ||
                            target instanceof KonanTarget.LINUX_MIPSEL32) && it.name == 'zlib.def') }
-            .collect { TargetDefFileKt.DefFile(it, target) }
+            .collect { DefFileKt.DefFile(it, target) }
 }
 
 private String defFileToLibName(String target, String name) {
diff --git a/shared/build.gradle b/shared/build.gradle
index 0a8aca9ef1e..25746e7e3cc 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -29,9 +29,8 @@ version = konanVersion
 
 repositories {
     mavenCentral()
-    maven {
-        url buildKotlinCompilerRepo
-    }
+    maven { url buildKotlinCompilerRepo }
+    maven { url kotlinCompilerRepo }
 }
 
 // FIXME(ddol): KLIB-REFACTORING-CLEANUP: drop generation of KonanVersion!
@@ -47,6 +46,7 @@ sourceSets {
 
 compileKotlin {
     dependsOn('generateCompilerVersion')
+    kotlinOptions.jvmTarget = "1.8"
 }
 
 clean {
@@ -62,4 +62,5 @@ jar {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
+    compile "org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion"
 }
diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle
index 2f0049ed891..0fcbcd18f86 100644
--- a/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/tools/kotlin-native-gradle-plugin/build.gradle
@@ -102,6 +102,7 @@ dependencies {
     bundleDependencies "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
     bundleDependencies "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     bundleDependencies "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlinVersion"
+    bundleDependencies "org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion"
     bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
 
     testImplementation 'junit:junit:4.12'
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt
index ca22cb82ac0..4f5d366a66c 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt
@@ -24,6 +24,8 @@ import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.jetbrains.kotlin.gradle.plugin.tasks.KonanArtifactWithLibrariesTask
 import org.jetbrains.kotlin.gradle.plugin.tasks.KonanBuildingTask
+import org.jetbrains.kotlin.konan.CURRENT
+import org.jetbrains.kotlin.konan.KonanVersion
 import org.jetbrains.kotlin.konan.library.SearchPathResolver
 import org.jetbrains.kotlin.konan.library.defaultResolver
 import org.jetbrains.kotlin.konan.target.Distribution
@@ -146,7 +148,8 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
             defaultResolver(
                     repos.map { it.absolutePath },
                     task.konanTarget,
-                    Distribution(konanHomeOverride = project.konanHome)
+                    Distribution(konanHomeOverride = project.konanHome),
+                    listOf(KonanVersion.CURRENT)
             )
     )
 
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt
index 78ca8fe51d2..f928dc22938 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt
@@ -34,6 +34,7 @@ import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin.Companion.COMPILE_ALL_TASK_NAME
 import org.jetbrains.kotlin.gradle.plugin.model.KonanToolingModelBuilder
 import org.jetbrains.kotlin.gradle.plugin.tasks.*
+import org.jetbrains.kotlin.konan.CURRENT
 import org.jetbrains.kotlin.konan.KonanVersion
 import org.jetbrains.kotlin.konan.parseKonanVersion
 import org.jetbrains.kotlin.konan.target.HostManager
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
index 521c3248cea..3171c4f0b0a 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
@@ -25,6 +25,8 @@ import org.gradle.process.CommandLineArgumentProvider
 import org.jetbrains.kotlin.gradle.plugin.konan.*
 import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifact
 import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifactImpl
+import org.jetbrains.kotlin.konan.CURRENT
+import org.jetbrains.kotlin.konan.KonanVersion
 import org.jetbrains.kotlin.konan.library.defaultResolver
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import org.jetbrains.kotlin.konan.target.Distribution
@@ -235,7 +237,8 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
         val resolver = defaultResolver(
                 repos.map { it.absolutePath },
                 konanTarget,
-                Distribution(konanHomeOverride = project.konanHome)
+                Distribution(konanHomeOverride = project.konanHome),
+                listOf(KonanVersion.CURRENT)
         )
 
         return KonanModelArtifactImpl(
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt
index 5c2394ceb91..39281476f91 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt
@@ -27,6 +27,8 @@ import org.jetbrains.kotlin.gradle.plugin.konan.*
 import org.jetbrains.kotlin.gradle.plugin.konan.KonanInteropSpec.IncludeDirectoriesSpec
 import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifact
 import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifactImpl
+import org.jetbrains.kotlin.konan.CURRENT
+import org.jetbrains.kotlin.konan.KonanVersion
 import org.jetbrains.kotlin.konan.library.defaultResolver
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import org.jetbrains.kotlin.konan.target.Distribution
@@ -171,7 +173,8 @@ open class KonanInteropTask @Inject constructor(val workerExecutor: WorkerExecut
         val resolver = defaultResolver(
                 repos.map { it.absolutePath },
                 konanTarget,
-                Distribution(konanHomeOverride = project.konanHome)
+                Distribution(konanHomeOverride = project.konanHome),
+                listOf(KonanVersion.CURRENT)
         )
 
         return KonanModelArtifactImpl(
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt
index 1e7a7e544e4..a7ec6217ace 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.gradle.plugin.konan.konanArtifactsContainer
 import org.jetbrains.kotlin.gradle.plugin.konan.konanExtension
 import org.jetbrains.kotlin.gradle.plugin.konan.konanHome
 import org.jetbrains.kotlin.gradle.plugin.konan.konanVersion
+import org.jetbrains.kotlin.konan.CURRENT
 import org.jetbrains.kotlin.konan.KonanVersion
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import java.io.File