diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt index d017a631349..2edb492b220 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt +++ b/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" diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.kt index 3a9dc222d1c..493e7783a40 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.kt +++ b/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 } } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt index 7b51bd516e8..4294449db4b 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt +++ b/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]})" diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt index d7832413f2d..4d4b722139c 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt +++ b/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() diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt index 1bde64e0003..65ff6b2aa65 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt +++ b/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", """ diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt index 690253f77dc..8e06ed704ec 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt +++ b/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)!! diff --git a/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml index f2c97becc48..d30c0728e81 100644 --- a/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml @@ -13,7 +13,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jre8 + kotlin-stdlib-jdk8 ${kotlin.version} diff --git a/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml index 719fe8231d6..140941b88be 100644 --- a/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml @@ -43,7 +43,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jre8 + kotlin-stdlib-jdk8 ${kotlin.version} diff --git a/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml index 49096ba632f..226b443ae4c 100644 --- a/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml @@ -13,7 +13,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jre8 + kotlin-stdlib-jdk8 ${kotlin.version} diff --git a/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml index bbed4c262be..5e2f08859b5 100644 --- a/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml @@ -15,7 +15,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jre8 + kotlin-stdlib-jdk8 ${kotlin.version} diff --git a/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml index a07bcf1cebd..96cc18b2825 100644 --- a/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml @@ -15,7 +15,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jre8 + kotlin-stdlib-jdk8 ${kotlin.version} diff --git a/idea/idea-maven/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml index bf437640c7f..4c189f2b4f8 100644 --- a/idea/idea-maven/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml @@ -15,7 +15,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jre8 + kotlin-stdlib-jdk8 ${kotlin.version} diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt index fa35d2bf7d3..2bb8cfc20f8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt +++ b/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 diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index 6b0390ed1b2..b0452be4600 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -106,7 +106,7 @@ fun TargetPlatformKind<*>.getPlatformCompilerArgumentsByProject(project: Project val TargetPlatformKind<*>.mavenLibraryIds: List 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) } diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt index 1658418ae21..64afc98c446 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt +++ b/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" diff --git a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle index b1fb9d89848..42edec8de58 100644 --- a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle +++ b/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$ diff --git a/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle index 9182798fcff..34541e294bd 100644 --- a/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle +++ b/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" } diff --git a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle b/idea/testData/configuration/android-gradle/buildConfigs_after.gradle index 7fd78842ec2..d97485715a0 100644 --- a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle b/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle index 6a4382d4aa9..8a86a7a77e3 100644 --- a/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle +++ b/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" } diff --git a/idea/testData/configuration/android-gradle/emptyFile_after.gradle b/idea/testData/configuration/android-gradle/emptyFile_after.gradle index 6cefa1cc8e8..3771a16109f 100644 --- a/idea/testData/configuration/android-gradle/emptyFile_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle index e81683abdd0..ffccae25e16 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle +++ b/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 { diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle index c45d035717f..1bab61e815f 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle +++ b/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 { diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle index 575ac2bdef3..0b8f2e6506b 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle index 1e20e22b2dd..c6a06dc21b9 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle index f3eed0ca325..acb7edfdbd3 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle index 293375ac3e9..5da95b54cab 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle +++ b/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" } diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle index 7c73da66059..9470c1f4f5e 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle index a3d655f3978..0aa46218bfa 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle +++ b/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 { diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle index 640db3d6c98..8fc87b9eda9 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle +++ b/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 { diff --git a/idea/testData/configuration/android-gradle/helloWorld_after.gradle b/idea/testData/configuration/android-gradle/helloWorld_after.gradle index db18d41e9ac..009a26eada3 100644 --- a/idea/testData/configuration/android-gradle/helloWorld_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/libraryFile_after.gradle b/idea/testData/configuration/android-gradle/libraryFile_after.gradle index 547b5cf74bc..a02b4217ad3 100644 --- a/idea/testData/configuration/android-gradle/libraryFile_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle b/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle index b3d180d4a9e..93396f9ae31 100644 --- a/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle +++ b/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" } diff --git a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle index 7d54dfb9d47..91288f9d998 100644 --- a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle +++ b/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$' diff --git a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle index a5e1fda10a4..39e40e44f32 100644 --- a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle +++ b/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$ \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/productFlavor_after.gradle b/idea/testData/configuration/android-gradle/productFlavor_after.gradle index c0e1831c8cc..8c4d92eeeca 100644 --- a/idea/testData/configuration/android-gradle/productFlavor_after.gradle +++ b/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" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gsk/emptyFile_after.gradle.kts b/idea/testData/configuration/android-gsk/emptyFile_after.gradle.kts index 0b9d833c176..dabcddba2d0 100644 --- a/idea/testData/configuration/android-gsk/emptyFile_after.gradle.kts +++ b/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() diff --git a/idea/testData/configuration/android-gsk/helloWorld_after.gradle.kts b/idea/testData/configuration/android-gsk/helloWorld_after.gradle.kts index 7673afbe52a..9e91e473dd4 100644 --- a/idea/testData/configuration/android-gsk/helloWorld_after.gradle.kts +++ b/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 { diff --git a/idea/testData/configuration/gradle/default/build_after.gradle b/idea/testData/configuration/gradle/default/build_after.gradle index f6416aa6139..0349e42b87f 100644 --- a/idea/testData/configuration/gradle/default/build_after.gradle +++ b/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$' diff --git a/idea/testData/configuration/gradle/missedLibrary/build_after.gradle b/idea/testData/configuration/gradle/missedLibrary/build_after.gradle index 34164d8efda..84127f7cabe 100644 --- a/idea/testData/configuration/gradle/missedLibrary/build_after.gradle +++ b/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 { diff --git a/idea/testData/configuration/gradle/plugin_present/build_after.gradle b/idea/testData/configuration/gradle/plugin_present/build_after.gradle index 83591579c77..8be3603e4d7 100644 --- a/idea/testData/configuration/gradle/plugin_present/build_after.gradle +++ b/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 { diff --git a/idea/testData/configuration/gradle/withJava9ModuleInfo/build_after.gradle b/idea/testData/configuration/gradle/withJava9ModuleInfo/build_after.gradle index 799bf7b1964..6c063e5ed82 100644 --- a/idea/testData/configuration/gradle/withJava9ModuleInfo/build_after.gradle +++ b/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$' diff --git a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts b/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts index f31cf2bded9..29fe530f934 100644 --- a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts +++ b/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$ diff --git a/idea/testData/configuration/gsk/helloWorld/build_after.gradle.kts b/idea/testData/configuration/gsk/helloWorld/build_after.gradle.kts index 73ca99d9a26..97c12b711f5 100644 --- a/idea/testData/configuration/gsk/helloWorld/build_after.gradle.kts +++ b/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 { diff --git a/idea/testData/configuration/gsk/missedLibrary/build_after.gradle.kts b/idea/testData/configuration/gsk/missedLibrary/build_after.gradle.kts index 879690b2d25..24c5e54eb43 100644 --- a/idea/testData/configuration/gsk/missedLibrary/build_after.gradle.kts +++ b/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 { diff --git a/idea/testData/configuration/gsk/pluginPresent/build_after.gradle.kts b/idea/testData/configuration/gsk/pluginPresent/build_after.gradle.kts index de678b70b3f..26c8a4ac2cc 100644 --- a/idea/testData/configuration/gsk/pluginPresent/build_after.gradle.kts +++ b/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 {