Configure new projects with kotlin-stdlib-jdk7/8 (KT-20286)

No migration for old projects has been added yet.

 #KT-20286 Fixed

compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt

@@ -30,10 +30,19 @@ object PathUtil {
     const val NOARG_PLUGIN_JAR_NAME = "noarg-compiler-plugin.jar"
     const val SAM_WITH_RECEIVER_PLUGIN_JAR_NAME = "sam-with-receiver-compiler-plugin.jar"
     const val JS_LIB_SRC_JAR_NAME = "kotlin-stdlib-js-sources.jar"
+
     const val KOTLIN_JAVA_RUNTIME_JRE7_JAR = "kotlin-stdlib-jre7.jar"
+    const val KOTLIN_JAVA_RUNTIME_JDK7_JAR = "kotlin-stdlib-jdk7.jar"
+
     const val KOTLIN_JAVA_RUNTIME_JRE8_JAR = "kotlin-stdlib-jre8.jar"
+    const val KOTLIN_JAVA_RUNTIME_JDK8_JAR = "kotlin-stdlib-jdk8.jar"
+
     const val KOTLIN_JAVA_RUNTIME_JRE7_SRC_JAR = "kotlin-stdlib-jre7-sources.jar"
+    const val KOTLIN_JAVA_RUNTIME_JDK7_SRC_JAR = "kotlin-stdlib-jdk7-sources.jar"
+
     const val KOTLIN_JAVA_RUNTIME_JRE8_SRC_JAR = "kotlin-stdlib-jre8-sources.jar"
+    const val KOTLIN_JAVA_RUNTIME_JDK8_SRC_JAR = "kotlin-stdlib-jdk8-sources.jar"
+
     const val KOTLIN_JAVA_STDLIB_JAR = "kotlin-stdlib.jar"
     const val KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar"
     const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar"

idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.kt

@@ -26,6 +26,7 @@ import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import org.jetbrains.kotlin.idea.configuration.KotlinWithGradleConfigurator
 import org.jetbrains.kotlin.idea.util.projectStructure.version
+import org.jetbrains.kotlin.idea.versions.MAVEN_STDLIB_ID_JDK7
 import org.jetbrains.kotlin.idea.versions.MAVEN_STDLIB_ID_JRE7
 import org.jetbrains.kotlin.idea.versions.hasJreSpecificRuntime
 import org.jetbrains.kotlin.resolve.TargetPlatform
@@ -66,7 +67,7 @@ class KotlinAndroidGradleModuleConfigurator internal constructor() : KotlinWithG
             val sdkVersion = sdk.version
             if (sdkVersion != null && sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_8)) {
                 // Android dex can't convert our kotlin-stdlib-jre8 artifact, so use jre7 instead (KT-16530)
-                return MAVEN_STDLIB_ID_JRE7
+                return MAVEN_STDLIB_ID_JDK7
             }
         }
 

idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt

@@ -20,9 +20,7 @@ import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.ProjectKeys
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.idea.versions.MAVEN_STDLIB_ID
-import org.jetbrains.kotlin.idea.versions.MAVEN_STDLIB_ID_JRE7
-import org.jetbrains.kotlin.idea.versions.MAVEN_STDLIB_ID_JRE8
+import org.jetbrains.kotlin.idea.versions.*
 import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.plugins.gradle.codeInspection.GradleBaseInspection
@@ -36,7 +34,8 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrC
 import java.util.*
 
 class DifferentStdlibGradleVersionInspection : GradleBaseInspection() {
-    override fun buildVisitor(): BaseInspectionVisitor = MyVisitor(listOf(MAVEN_STDLIB_ID, MAVEN_STDLIB_ID_JRE7, MAVEN_STDLIB_ID_JRE8))
+    override fun buildVisitor(): BaseInspectionVisitor = MyVisitor(
+            listOf(MAVEN_STDLIB_ID, MAVEN_STDLIB_ID_JRE7, MAVEN_STDLIB_ID_JDK7, MAVEN_STDLIB_ID_JRE8, MAVEN_STDLIB_ID_JDK8))
 
     override fun buildErrorString(vararg args: Any) =
             "Plugin version (${args[0]}) is not the same as library version (${args[1]})"

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt

@@ -164,7 +164,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
                         plugin("kotlin")
                     }
                     dependencies {
-                        compile(kotlinModule("stdlib-jre8", kotlin_version))
+                        compile(kotlinModule("stdlib-jdk8", kotlin_version))
                     }
                     repositories {
                         mavenCentral()

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt

@@ -92,6 +92,41 @@ class GradleInspectionTest : GradleImportingTestCase() {
         Assert.assertEquals("Plugin version (1.1.0-beta-17) is not the same as library version (1.1.0-beta-22)", problems.single())
     }
 
+    @Test
+    fun testDifferentStdlibJdk7GradleVersion() {
+        val localFile = createProjectSubFile("build.gradle", """
+            group 'Again'
+            version '1.0-SNAPSHOT'
+
+            buildscript {
+                repositories {
+                    mavenCentral()
+                    maven {
+                        url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1'
+                    }
+                }
+
+                dependencies {
+                    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0-beta-17")
+                }
+            }
+
+            apply plugin: 'kotlin'
+
+            dependencies {
+                compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.1.0-beta-22"
+            }
+        """)
+        importProject()
+
+        val tool = DifferentStdlibGradleVersionInspection()
+        val problems = getInspectionResult(tool, localFile)
+
+        Assert.assertTrue(problems.size == 1)
+        Assert.assertEquals("Plugin version (1.1.0-beta-17) is not the same as library version (1.1.0-beta-22)", problems.single())
+    }
+
+
     @Test
     fun testDifferentStdlibGradleVersionWithVariables() {
         createProjectSubFile("gradle.properties", """

idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt

@@ -108,7 +108,7 @@ class PomFile private constructor(val xmlFile: XmlFile, val domModel: MavenDomPr
         require(artifact.artifactId != null) { "artifactId shouldn't be null" }
 
         ensureDependencies()
-        val versionless = artifact.withNoVersion().withoutJreSuffix()
+        val versionless = artifact.withNoVersion().withoutJDKSpecificSuffix()
         val dependency = domModel.dependencies.dependencies.firstOrNull { it.matches(versionless) } ?: domModel.dependencies.addDependency()
         dependency.groupId.stringValue = artifact.groupId
         dependency.artifactId.stringValue = artifact.artifactId
@@ -397,7 +397,10 @@ class PomFile private constructor(val xmlFile: XmlFile, val domModel: MavenDomPr
             && (artifact.version == null || version.stringValue == artifact.version)
 
     private fun MavenId.withNoVersion() = MavenId(groupId, artifactId, null)
-    private fun MavenId.withoutJreSuffix() = MavenId(groupId, artifactId?.substringBeforeLast("-jre"), null)
+    private fun MavenId.withoutJDKSpecificSuffix() = MavenId(
+            groupId,
+            artifactId?.substringBeforeLast("-jre")?.substringBeforeLast("-jdk"),
+            null)
 
     private fun MavenDomElement.createChildTag(name: String, value: String? = null) = xmlTag.createChildTag(name, value)
     private fun XmlTag.createChildTag(name: String, value: String? = null) = createChildTag(name, namespace, value, false)!!

idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml

@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>

idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml

@@ -43,7 +43,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>

idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml

@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>

idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml

@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>

idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml

@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>

idea/idea-maven/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml

@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt

@@ -78,10 +78,10 @@ open class KotlinJavaModuleConfigurator internal constructor() : KotlinWithLibra
                       LibraryJarDescriptor.TEST_JAR)
         val sdkVersion = sdk?.version ?: return result
         if (sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_7)) {
-            result += listOf(LibraryJarDescriptor.RUNTIME_JRE7_JAR, LibraryJarDescriptor.RUNTIME_JRE7_SOURCES_JAR)
+            result += listOf(LibraryJarDescriptor.RUNTIME_JDK7_JAR, LibraryJarDescriptor.RUNTIME_JDK7_SOURCES_JAR)
         }
         if (sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_8)) {
-            result += listOf(LibraryJarDescriptor.RUNTIME_JRE8_JAR, LibraryJarDescriptor.RUNTIME_JRE8_SOURCES_JAR)
+            result += listOf(LibraryJarDescriptor.RUNTIME_JDK8_JAR, LibraryJarDescriptor.RUNTIME_JDK8_SOURCES_JAR)
         }
 
         return result

idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt

@@ -106,7 +106,7 @@ fun TargetPlatformKind<*>.getPlatformCompilerArgumentsByProject(project: Project
 
 val TargetPlatformKind<*>.mavenLibraryIds: List<String>
     get() = when (this) {
-        is TargetPlatformKind.Jvm -> listOf(MAVEN_STDLIB_ID, MAVEN_STDLIB_ID_JRE7, MAVEN_STDLIB_ID_JRE8)
+        is TargetPlatformKind.Jvm -> listOf(MAVEN_STDLIB_ID, MAVEN_STDLIB_ID_JRE7, MAVEN_STDLIB_ID_JDK7, MAVEN_STDLIB_ID_JRE8, MAVEN_STDLIB_ID_JDK8)
         is TargetPlatformKind.JavaScript -> listOf(MAVEN_JS_STDLIB_ID, MAVEN_OLD_JS_STDLIB_ID)
         is TargetPlatformKind.Common -> listOf(MAVEN_COMMON_STDLIB_ID)
     }

idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt

@@ -176,10 +176,22 @@ enum class LibraryJarDescriptor(val jarName: String,
     REFLECT_JAR(PathUtil.KOTLIN_JAVA_REFLECT_JAR, OrderRootType.CLASSES, false, KotlinPaths::getReflectPath),
     SCRIPT_RUNTIME_JAR(PathUtil.KOTLIN_JAVA_SCRIPT_RUNTIME_JAR, OrderRootType.CLASSES, true, KotlinPaths::getScriptRuntimePath),
     TEST_JAR(PathUtil.KOTLIN_TEST_JAR, OrderRootType.CLASSES, false, KotlinPaths::getKotlinTestPath),
+
+    @Deprecated("RUNTIME_JDK7_JAR should be used since 1.2")
     RUNTIME_JRE7_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JRE7_JAR, OrderRootType.CLASSES, false),
+    RUNTIME_JDK7_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_JAR, OrderRootType.CLASSES, false),
+
+    @Deprecated("RUNTIME_JDK8_JAR should be used since 1.2")
     RUNTIME_JRE8_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JRE8_JAR, OrderRootType.CLASSES, false),
+    RUNTIME_JDK8_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_JAR, OrderRootType.CLASSES, false),
+
+    @Deprecated("RUNTIME_JDK7_SOURCES_JAR should be used since 1.2")
     RUNTIME_JRE7_SOURCES_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JRE7_SRC_JAR, OrderRootType.SOURCES, false),
+    RUNTIME_JDK7_SOURCES_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_SRC_JAR, OrderRootType.SOURCES, false),
+
+    @Deprecated("RUNTIME_JDK8_SOURCES_JAR should be used since 1.2")
     RUNTIME_JRE8_SOURCES_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JRE8_SRC_JAR, OrderRootType.SOURCES, false),
+    RUNTIME_JDK8_SOURCES_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_SRC_JAR, OrderRootType.SOURCES, false),
 
     RUNTIME_SRC_JAR(PathUtil.KOTLIN_JAVA_STDLIB_SRC_JAR, OrderRootType.SOURCES, false, KotlinPaths::getStdlibSourcesPath) {
         override fun findExistingJar(library: Library): VirtualFile? {
@@ -336,8 +348,8 @@ fun getStdlibArtifactId(sdk: Sdk?, version: String): String {
 
     val sdkVersion = sdk?.version
     return when (sdkVersion) {
-        JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_1_9 -> MAVEN_STDLIB_ID_JRE8
-        JavaSdkVersion.JDK_1_7 -> MAVEN_STDLIB_ID_JRE7
+        JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_1_9 -> MAVEN_STDLIB_ID_JDK8
+        JavaSdkVersion.JDK_1_7 -> MAVEN_STDLIB_ID_JDK7
         else -> MAVEN_STDLIB_ID
     }
 }
@@ -359,8 +371,13 @@ fun hasJreSpecificRuntime(version: String): Boolean =
         version == "default_version" /* for tests */
 
 val MAVEN_STDLIB_ID = "kotlin-stdlib"
+
 val MAVEN_STDLIB_ID_JRE7 = "kotlin-stdlib-jre7"
+val MAVEN_STDLIB_ID_JDK7 = "kotlin-stdlib-jdk7"
+
 val MAVEN_STDLIB_ID_JRE8 = "kotlin-stdlib-jre8"
+val MAVEN_STDLIB_ID_JDK8 = "kotlin-stdlib-jdk8"
+
 val MAVEN_JS_STDLIB_ID = "kotlin-stdlib-js"
 val MAVEN_JS_TEST_ID = "kotlin-test-js"
 val MAVEN_OLD_JS_STDLIB_ID = "kotlin-js-library"

idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle

@@ -33,7 +33,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 // VERSION: $VERSION$

idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle

@@ -27,5 +27,5 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/buildConfigs_after.gradle

@@ -34,5 +34,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle

@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/emptyFile_after.gradle

@@ -12,5 +12,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle

@@ -34,7 +34,7 @@ project.afterEvaluate {
 
 dependencies {
     compile project(':lib')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 buildscript {

idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle

@@ -20,7 +20,7 @@ dependencies {
     debugCompile 'com.android.support:support-v13:13.0.0'
 
     compile 'com.google.android.gms:play-services:3.1.36'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 android {

idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle

@@ -52,5 +52,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle

@@ -63,5 +63,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle

@@ -27,5 +27,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle

@@ -28,5 +28,5 @@ android.applicationVariants.each { variant ->
     variant.outputFile = file("$project.buildDir/${variant.name}.apk")
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle

@@ -47,5 +47,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle

@@ -21,7 +21,7 @@ repositories {
 dependencies {
     compile 'com.example.android.multiproject:util:1.0'
     releaseCompile 'com.google.guava:guava:11.0.2'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 android {

idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle

@@ -11,7 +11,7 @@ android {
 //
 dependencies {
     compile project(':lib')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 buildscript {

idea/testData/configuration/android-gradle/helloWorld_after.gradle

@@ -19,5 +19,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/libraryFile_after.gradle

@@ -41,5 +41,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle

@@ -26,5 +26,5 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle

@@ -17,7 +17,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'

idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle

@@ -32,7 +32,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 // VERSION: $VERSION$

idea/testData/configuration/android-gradle/productFlavor_after.gradle

@@ -27,5 +27,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

idea/testData/configuration/android-gsk/emptyFile_after.gradle.kts

@@ -13,7 +13,7 @@ apply {
     plugin("kotlin-android")
 }
 dependencies {
-    compile(kotlinModule("stdlib-jre7", kotlin_version))
+    compile(kotlinModule("stdlib-jdk7", kotlin_version))
 }
 repositories {
     mavenCentral()

idea/testData/configuration/android-gsk/helloWorld_after.gradle.kts

@@ -41,7 +41,7 @@ android {
 dependencies {
     compile("com.android.support:appcompat-v7:23.4.0")
     compile("com.android.support.constraint:constraint-layout:1.0.0-alpha8")
-    compile(kotlinModule("stdlib-jre7", kotlin_version))
+    compile(kotlinModule("stdlib-jdk7", kotlin_version))
 }
 
 repositories {

idea/testData/configuration/gradle/default/build_after.gradle

@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'

idea/testData/configuration/gradle/missedLibrary/build_after.gradle

@@ -6,7 +6,7 @@ version = '1.0'
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 
 buildscript {

idea/testData/configuration/gradle/plugin_present/build_after.gradle

@@ -6,7 +6,7 @@ version = '1.0'
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 
 buildscript {

idea/testData/configuration/gradle/withJava9ModuleInfo/build_after.gradle

@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'

idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts

@@ -35,7 +35,7 @@ repositories {
 
 dependencies {
     testCompile("junit:junit:4.12")
-    compile(kotlinModule("stdlib-jre8", kotlin_version))
+    compile(kotlinModule("stdlib-jdk8", kotlin_version))
 }
 
 // VERSION: $VERSION$

idea/testData/configuration/gsk/helloWorld/build_after.gradle.kts

@@ -30,7 +30,7 @@ repositories {
 
 dependencies {
     testCompile("junit:junit:4.12")
-    compile(kotlinModule("stdlib-jre8", kotlin_version))
+    compile(kotlinModule("stdlib-jdk8", kotlin_version))
 }
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {

idea/testData/configuration/gsk/missedLibrary/build_after.gradle.kts

@@ -33,7 +33,7 @@ repositories {
 
 dependencies {
     testCompile("junit:junit:4.12")
-    compile(kotlinModule("stdlib-jre8", kotlin_version))
+    compile(kotlinModule("stdlib-jdk8", kotlin_version))
 }
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {

idea/testData/configuration/gsk/pluginPresent/build_after.gradle.kts

@@ -31,7 +31,7 @@ repositories {
 
 dependencies {
     testCompile("junit:junit:4.12")
-    compile(kotlinModule("stdlib-jre8", kotlin_version))
+    compile(kotlinModule("stdlib-jdk8", kotlin_version))
 }
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {