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

Use JvmTarget.DEFAULT instead of JVM_1_6 where applicable

Browse Source
This commit is contained in:
Alexander Udalov
2019-03-04 19:28:00 +01:00
parent a6b7aa3257
commit c7c377e1b1
7 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt
+1 -1
View File
@@ -140,7 +140,7 @@ object TopDownAnalyzerFacadeForJVM {
val sourceScope = if (separateModules) sourceModuleSearchScope else GlobalSearchScope.allScope(project)
val moduleClassResolver = SourceOrBinaryModuleClassResolver(sourceScope)
val jvmTarget = configuration.get(JVMConfigurationKeys.JVM_TARGET) ?: JvmTarget.JVM_1_6
val jvmTarget = configuration.get(JVMConfigurationKeys.JVM_TARGET, JvmTarget.DEFAULT)
val languageVersionSettings = configuration.languageVersionSettings
val optionalBuiltInsModule =
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
+1 -1
View File
@@ -82,7 +82,7 @@ object JvmAnalyzerFacade : ResolverForModuleFactory() {
resolverForModule.componentProvider.get<JavaDescriptorResolver>()
}
val jvmTarget = targetPlatformVersion as? JvmTarget ?: JvmTarget.JVM_1_6
val jvmTarget = targetPlatformVersion as? JvmTarget ?: JvmTarget.DEFAULT
val trace = CodeAnalyzerInitializer.getInstance(project).createTrace()
val lookupTracker = LookupTracker.DO_NOTHING
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+1 -1
View File
@@ -286,7 +286,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
}
}
return result ?: JvmTarget.JVM_1_6
return result ?: JvmTarget.DEFAULT
}
private fun checkDynamicCallDescriptors(expectedFile: File, testFiles: List<TestFile>) {
compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt
+1 -1
View File
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.types.expressions.FakeCallResolver
fun createContainerForTests(project: Project, module: ModuleDescriptor): ContainerForTests {
return ContainerForTests(createContainer("Tests", JvmPlatform) {
configureModule(ModuleContext(module, project), JvmPlatform, JvmTarget.JVM_1_6)
configureModule(ModuleContext(module, project), JvmPlatform, JvmTarget.DEFAULT)
useInstance(LanguageVersionSettingsImpl.DEFAULT)
useImpl<AnnotationResolverImpl>()
useImpl<ExpressionTypingServices>()
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+1 -1
View File
@@ -220,7 +220,7 @@ fun detectPlatformKindByPlugin(moduleNode: DataNode<ModuleData>): IdePlatformKin
)
fun detectPlatformByPlugin(moduleNode: DataNode<ModuleData>): TargetPlatformKind<*>? {
return when (moduleNode.platformPluginId) {
"kotlin-platform-jvm" -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]
"kotlin-platform-jvm" -> TargetPlatformKind.Jvm[JvmTarget.DEFAULT]
"kotlin-platform-js" -> TargetPlatformKind.JavaScript
"kotlin-platform-common" -> TargetPlatformKind.Common
else -> null
idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt
+1 -1
View File
@@ -25,7 +25,7 @@ object JvmIdePlatformKind : IdePlatformKind<JvmIdePlatformKind>() {
override val compilerPlatform get() = JvmPlatform
override val platforms = JvmTarget.values().map { ver -> Platform(ver) }
override val defaultPlatform get() = Platform(JvmTarget.JVM_1_6)
override val defaultPlatform get() = Platform(JvmTarget.DEFAULT)
override val argumentsClass get() = K2JVMCompilerArguments::class.java
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt
+1 -5
View File
@@ -208,16 +208,12 @@ class KJvmCompilerImpl(val hostConfiguration: ScriptingHostConfiguration) : KJvm
reportingState.currentArguments = baseArguments
return org.jetbrains.kotlin.config.CompilerConfiguration().apply {
// default value differs from the argument'ss default (see #KT-29405 and #KT-29319)
put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_8)
put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
setupCommonArguments(baseArguments)
setupJvmSpecificArguments(baseArguments)
// default value differs from the argument'ss default (see #KT-29405 and #KT-29319)
// Default value differs from the argument's default (see #KT-29405 and #KT-29319)
put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_8)
val jdkHomeFromConfigurations = scriptCompilationConfiguration.getNoDefault(ScriptCompilationConfiguration.jvm.jdkHome)