Merge pull request #19496 from smowton/smowton/admin/cleanup-kotlin-versions

Kotlin: clean up alternate-version code now that v1.5.x support is dropped

Author: smowton

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

@@ -8053,7 +8053,7 @@ open class KotlinFileExtractor(
                 ?.symbol
                 ?.typeWithArguments(listOf(functionNTypeArguments.last()))
         else
-            functionN(pluginContext)(functionNTypeArguments.size - 1)
+            pluginContext.irBuiltIns.functionN(functionNTypeArguments.size - 1)
                 .symbol
                 .typeWithArguments(functionNTypeArguments)
 

java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt

@@ -2,7 +2,6 @@ package com.github.codeql
 
 import com.github.codeql.utils.versions.copyParameterToFunction
 import com.github.codeql.utils.versions.createImplicitParameterDeclarationWithWrappedDescriptor
-import com.github.codeql.utils.versions.getAnnotationType
 import java.lang.annotation.ElementType
 import java.util.HashSet
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -375,7 +374,7 @@ class MetaAnnotationSupport(
                     .apply {
                         createImplicitParameterDeclarationWithWrappedDescriptor()
                         parent = annotationClass
-                        superTypes = listOf(getAnnotationType(pluginContext))
+                        superTypes = listOf(pluginContext.irBuiltIns.annotationType)
                     }
 
             val propertyName = Name.identifier("value")