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

[213] Switch to 213 platform

Browse Source 
KTI-1114
This commit is contained in:
Roman Golyshev
2022-07-19 17:15:29 +02:00
committed by Space Team
parent 7f07b2a82c
commit d4cffb8a5a
94 changed files with 173 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+2 -2
View File
@@ -168,7 +168,7 @@ class KotlinCoreEnvironment private constructor(
with(project) {
registerService(
CoreJavaFileManager::class.java,
ServiceManager.getService(this, JavaFileManager::class.java) as CoreJavaFileManager
this.getService(JavaFileManager::class.java) as CoreJavaFileManager
)
registerKotlinLightClassSupport(project)
@@ -199,7 +199,7 @@ class KotlinCoreEnvironment private constructor(
sourceFiles.sortBy { it.virtualFile.path }
val javaFileManager = ServiceManager.getService(project, CoreJavaFileManager::class.java) as KotlinCliJavaFileManagerImpl
val javaFileManager = project.getService(CoreJavaFileManager::class.java) as KotlinCliJavaFileManagerImpl
val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt
+2
View File
@@ -59,4 +59,6 @@ class MockExternalAnnotationsManager : ExternalAnnotationsManager() {
override fun findDefaultConstructorExternalAnnotations(aClass: PsiClass): List<PsiAnnotation> = emptyList()
override fun findExternalAnnotations(listOwner: PsiModifierListOwner, annotationFQN: String): List<PsiAnnotation> = emptyList()
override fun hasConfiguredAnnotationRoot(owner: PsiModifierListOwner): Boolean = false
}
compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt
+1 -1
View File
@@ -41,7 +41,7 @@ class CtSymClassVirtualFile(
override fun refresh(p0: Boolean, p1: Boolean, p2: Runnable?) = file.refresh(p0, p1, p2)
override fun getInputStream(): InputStream? = file.inputStream
override fun getInputStream(): InputStream = file.inputStream
override fun getFileType(): FileType = JavaClassFileType.INSTANCE
compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt
+1 -1
View File
@@ -81,5 +81,5 @@ class CtSymDirectoryContainer(
override fun refresh(p0: Boolean, p1: Boolean, p2: Runnable?) {}
override fun getInputStream(): InputStream? = error("not supported")
override fun getInputStream(): InputStream = error("not supported")
}
compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt
+2 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.cli.jvm.modules
import com.intellij.openapi.util.SystemInfo
import com.intellij.util.lang.JavaVersion
fun isAtLeastJava9(): Boolean {
return SystemInfo.isJavaVersionAtLeast(9, 0, 0)
return JavaVersion.current() >= JavaVersion.compose(9)
}