Inline version-specific override code where there is now only one version

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")

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/FileEntry.kt

@@ -1,5 +0,0 @@
-package com.github.codeql.utils.versions
-
-import org.jetbrains.kotlin.ir.IrFileEntry
-
-typealias FileEntry = IrFileEntry

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt

@@ -1,5 +0,0 @@
-package com.github.codeql.utils.versions
-
-import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
-
-fun functionN(pluginContext: IrPluginContext) = pluginContext.irBuiltIns::functionN

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt

@@ -1,5 +0,0 @@
-package com.github.codeql.utils.versions
-
-import org.jetbrains.kotlin.ir.IrBuiltIns
-
-typealias IrBuiltIns = org.jetbrains.kotlin.ir.IrBuiltIns

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt

@@ -1,5 +0,0 @@
-package com.github.codeql.utils.versions
-
-import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
-
-fun getAnnotationType(context: IrPluginContext) = context.irBuiltIns.annotationType

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/typeUtils.kt

@@ -1,6 +1,7 @@
 package com.github.codeql.utils.versions
 
 import org.jetbrains.kotlin.ir.types.*
+import org.jetbrains.kotlin.ir.IrBuiltIns
 
 fun IrType.isNullableCodeQL(): Boolean =
     this.isNullable()

java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt

@@ -2,6 +2,7 @@ package com.github.codeql.utils.versions
 
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.IrBuiltIns
 
 fun IrType.isNullableCodeQL(): Boolean =
     this.isNullable()