Switch to 182 platform

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.codegen.inline
 
-import jdk.internal.org.objectweb.asm.Opcodes
+import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.load.kotlin.getContainingKotlinJvmBinaryClass

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt.181

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.codegen.inline
 
-import org.jetbrains.org.objectweb.asm.Opcodes
+import jdk.internal.org.objectweb.asm.Opcodes
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.load.kotlin.getContainingKotlinJvmBinaryClass

compiler/compiler.pro

@@ -51,9 +51,19 @@ messages/**)
 -dontwarn org.jetbrains.annotations.Mutable
 -dontwarn com.intellij.util.io.TarUtil
 
-# Depends on apache batik which has lots of dependencies
+# Nullability annotations used in Guava
+-dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl
+-dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl
+
+# Depends on apache batick which has lots of dependencies
 -dontwarn com.intellij.util.SVGLoader*
 
+-dontwarn org.jdom.xpath.jaxen.*
+-dontwarn com.intellij.util.io.Decompressor*
+-dontwarn org.w3c.dom.Location
+-dontwarn org.w3c.dom.Window
+
+
 #-libraryjars '<rtjar>'
 #-libraryjars '<jssejar>'
 #-libraryjars '<bootstrap.runtime>'

compiler/compiler.pro.181

@@ -51,19 +51,9 @@ messages/**)
 -dontwarn org.jetbrains.annotations.Mutable
 -dontwarn com.intellij.util.io.TarUtil
 
-# Nullability annotations used in Guava
--dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl
--dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl
-
-# Depends on apache batick which has lots of dependencies
+# Depends on apache batik which has lots of dependencies
 -dontwarn com.intellij.util.SVGLoader*
 
--dontwarn org.jdom.xpath.jaxen.*
--dontwarn com.intellij.util.io.Decompressor*
--dontwarn org.w3c.dom.Location
--dontwarn org.w3c.dom.Window
-
-
 #-libraryjars '<rtjar>'
 #-libraryjars '<jssejar>'
 #-libraryjars '<bootstrap.runtime>'

compiler/frontend.java/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     compile(project(":core:descriptors"))
     compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
+    compile("javax.annotation:jsr250-api:1.0")
     compile(project(":compiler:frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) }

compiler/frontend.java/build.gradle.kts.181

@@ -10,7 +10,6 @@ dependencies {
     compile(project(":core:descriptors"))
     compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
-    compile("javax.annotation:jsr250-api:1.0")
     compile(project(":compiler:frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) }

compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt

@@ -166,7 +166,7 @@ abstract class KtCodeFragment(
 
     override fun getExceptionHandler() = exceptionHandler
 
-    override fun importClass(aClass: PsiClass?): Boolean {
+    override fun importClass(aClass: PsiClass): Boolean {
         return true
     }
 

compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt.181

@@ -166,7 +166,7 @@ abstract class KtCodeFragment(
 
     override fun getExceptionHandler() = exceptionHandler
 
-    override fun importClass(aClass: PsiClass): Boolean {
+    override fun importClass(aClass: PsiClass?): Boolean {
         return true
     }
 

compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt

@@ -75,6 +75,8 @@ abstract class KtConstructor<T : KtConstructor<T>> : KtDeclarationStub<KotlinPla
 
     override fun getNameIdentifier() = null
 
+    override fun getIdentifyingElement(): PsiElement? = getConstructorKeyword()
+
     @Throws(IncorrectOperationException::class)
     override fun setName(name: String): PsiElement = throw IncorrectOperationException("setName to constructor")
 

compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt.181

@@ -75,8 +75,6 @@ abstract class KtConstructor<T : KtConstructor<T>> : KtDeclarationStub<KotlinPla
 
     override fun getNameIdentifier() = null
 
-    override fun getIdentifyingElement(): PsiElement? = getConstructorKeyword()
-
     @Throws(IncorrectOperationException::class)
     override fun setName(name: String): PsiElement = throw IncorrectOperationException("setName to constructor")
 

compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt

@@ -67,5 +67,7 @@ class KtObjectDeclaration : KtClassOrObject {
 
     fun getObjectKeyword(): PsiElement? = findChildByType(KtTokens.OBJECT_KEYWORD)
 
+    override fun getIdentifyingElement(): PsiElement? = getObjectKeyword()
+
     override fun getCompanionObjects(): List<KtObjectDeclaration> = emptyList()
 }

compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt.181

@@ -67,7 +67,5 @@ class KtObjectDeclaration : KtClassOrObject {
 
     fun getObjectKeyword(): PsiElement? = findChildByType(KtTokens.OBJECT_KEYWORD)
 
-    override fun getIdentifyingElement(): PsiElement? = getObjectKeyword()
-
     override fun getCompanionObjects(): List<KtObjectDeclaration> = emptyList()
 }

compiler/tests-common/build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
     testCompile(androidDxJar()) { isTransitive = false }
     testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false }
     testCompile(intellijDep()) {
-        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
+        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
         isTransitive = false
     }
 }

compiler/tests-common/build.gradle.kts.181

@@ -31,7 +31,7 @@ dependencies {
     testCompile(androidDxJar()) { isTransitive = false }
     testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false }
     testCompile(intellijDep()) {
-        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
+        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
         isTransitive = false
     }
 }