azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
No migration for old projects has been added yet.

 #KT-20286 Fixed
This commit is contained in:
Nikolay Krasko
2017-10-24 18:07:06 +03:00
parent b7b3caedcc
commit 6a43743c98
45 changed files with 113 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.kt
+2 -1
View File
@@ -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
}
}