diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 85360c3d32b..933176e2a64 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -15,6 +15,33 @@ String jdkPath(String version) {
 //}
 
 ext.configureJvmProject = { Project project ->
+    project.configure(project) {
+        task sourcesJar(type: Jar, dependsOn: classes) {
+            classifier = 'sources'
+            from sourceSets.main.kotlin
+        }
+
+        tasks.withType(JavaCompile) {
+//            sourceCompatibility = 1.6
+//            targetCompatibility = 1.6
+            options.fork = true
+            options.forkOptions.javaHome = file(JDK_18)
+        }
+
+        tasks.withType(project.compileKotlin.class) {
+            kotlinOptions.jdkHome = JDK_18
+            doFirst {
+                System.setProperty("kotlin.colors.enabled", "false")
+            }
+        }
+
+        test {
+            executable = "$JDK_16/bin/java"
+        }
+    }
+}
+
+ext.configureJvm6Project = { Project project ->
     project.configure(project) {
         task sourcesJar(type: Jar, dependsOn: classes) {
             classifier = 'sources'
diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index 258f455aae5..93e62127537 100644
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -2,7 +2,7 @@ description = 'Kotlin Test JUnit'
 
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 95237705d05..cdbab85b2d0 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -3,7 +3,7 @@ description = 'Kotlin Test'
 
 apply plugin: 'kotlin-platform-jvm'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 dependencies {
diff --git a/libraries/stdlib/build.gradle b/libraries/stdlib/build.gradle
index f57336ae826..40c027c513d 100644
--- a/libraries/stdlib/build.gradle
+++ b/libraries/stdlib/build.gradle
@@ -2,7 +2,7 @@ description = 'Kotlin Standard Library'
 
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 sourceSets {
@@ -49,6 +49,10 @@ dependencies {
     testCompile project(':kotlin-test:kotlin-test-junit')
 }
 
+configurations {
+    mainJar
+}
+
 task originalStdlibJar(type: Jar) {
     baseName = 'original-kotlin-stdlib'
     from sourceSets.main.output
@@ -79,6 +83,7 @@ sourcesJar {
 artifacts {
     archives sourcesJar
     archives javadocJar
+    mainJar jar
 }
 
 dist {
diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle
index 370b595ff41..9f5042e0699 100644
--- a/libraries/stdlib/jre7/build.gradle
+++ b/libraries/stdlib/jre7/build.gradle
@@ -2,7 +2,7 @@ description = 'Kotlin Standard Library JRE 7 extension'
 
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 dependencies {
diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle
index b5dbf0a2586..17247385e03 100644
--- a/libraries/stdlib/jre8/build.gradle
+++ b/libraries/stdlib/jre8/build.gradle
@@ -2,7 +2,7 @@ description = 'Kotlin Standard Library JRE 8 extension'
 
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 dependencies {
diff --git a/libraries/tools/kotlin-reflect/build.gradle b/libraries/tools/kotlin-reflect/build.gradle
index db0813e83b2..7ae1b67b415 100644
--- a/libraries/tools/kotlin-reflect/build.gradle
+++ b/libraries/tools/kotlin-reflect/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 
@@ -42,6 +42,7 @@ configurations {
     proguardDeps
     shadows
     compileOnly.extendsFrom(shadows)
+    mainJar
 }
 
 dependencies {
@@ -174,6 +175,7 @@ task relocatedSourcesJar(type: Jar) {
 def artifactJar = [file: file(outputJarPath), builtBy: proguard, name: archivesBaseName]
 
 artifacts {
+    mainJar artifactJar
     runtime artifactJar
     archives artifactJar
     archives relocatedSourcesJar
diff --git a/libraries/tools/runtime/build.gradle b/libraries/tools/runtime/build.gradle
index 3332edd3a2d..b431a9be81b 100644
--- a/libraries/tools/runtime/build.gradle
+++ b/libraries/tools/runtime/build.gradle
@@ -2,7 +2,7 @@ description 'Kotlin Runtime (deprecated, use koltin-stdlib artifact instead)'
 
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 dependencies {
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index 0ff4706d856..6d765e999c7 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -2,13 +2,17 @@ description 'Kotlin Script Runtime'
 
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
+configureJvm6Project(project)
 configurePublishing(project)
 
 dependencies {
     compileOnly project(':kotlin-stdlib')
 }
 
+configurations {
+    mainJar
+}
+
 sourceSets {
     main {
         kotlin {
@@ -24,9 +28,9 @@ jar {
 artifacts {
     archives sourcesJar
     archives javadocJar
+    mainJar jar
 }
 
-
 dist {
     from (jar, sourcesJar)
 }