Merge pull request #14393 from igfoo/igfoo/no1.4

Kotlin: Remove 1.4 compatibility

Author: igfoo

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

@@ -168,7 +168,6 @@ class KotlinExtractorExtension(
             return defaultCompression
         } else {
             try {
-                @OptIn(kotlin.ExperimentalStdlibApi::class) // Annotation required by kotlin versions < 1.5
                 val compression_option_upper = compression_option.uppercase()
                 if (compression_option_upper == "BROTLI") {
                     logger.warn("Kotlin extractor doesn't support Brotli compression. Using GZip instead.")

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

@@ -116,7 +116,6 @@ open class KotlinFileExtractor(
 
             val exceptionOnFile = System.getenv("CODEQL_KOTLIN_INTERNAL_EXCEPTION_WHILE_EXTRACTING_FILE")
             if(exceptionOnFile != null) {
-                @OptIn(kotlin.ExperimentalStdlibApi::class) // Annotation required by kotlin versions < 1.5
                 if(exceptionOnFile.lowercase() == file.name.lowercase()) {
                     throw Exception("Internal testing exception")
                 }
@@ -403,7 +402,7 @@ open class KotlinFileExtractor(
             // Extract the outer <-> inner class relationship, passing on any type arguments in excess to this class' parameters if this is an inner class.
             // For example, in `class Outer<T> { inner class Inner<S> { } }`, `Inner<Int, String>` nests within `Outer<Int>` and raw `Inner<>` within `Outer<>`,
             // but for a similar non-`inner` (in Java terms, static nested) class both `Inner<Int>` and `Inner<>` nest within the unbound type `Outer`.
-            val useBoundOuterType = (c.isInner || c.isLocal) && (c.parents.map { // Would use `firstNotNullOfOrNull`, but this doesn't exist in Kotlin 1.4
+            val useBoundOuterType = (c.isInner || c.isLocal) && (c.parents.firstNotNullOfOrNull {
                 when(it) {
                     is IrClass -> when {
                         it.typeParameters.isNotEmpty() -> true // Type parameters visible to this class -- extract an enclosing bound or raw type.
@@ -412,7 +411,7 @@ open class KotlinFileExtractor(
                     }
                     else -> null // Look through enclosing non-class entities (this may need to change)
                 }
-            }.firstOrNull { it != null } ?: false)
+            } ?: false)
 
             extractEnclosingClass(c.parent, id, c, locId, if (useBoundOuterType) argsIncludingOuterClasses?.drop(c.typeParameters.size) else listOf())
 

java/kotlin-extractor/src/main/kotlin/utils/ClassNames.kt

@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
 // for `that`.
 private fun getName(d: IrDeclarationWithName) = (d as? IrAnnotationContainer)?.let { getJvmName(it) } ?: d.name.asString()
 
-@OptIn(ExperimentalStdlibApi::class) // Annotation required by kotlin versions < 1.5
 fun getFileClassName(f: IrFile) =
     getJvmName(f) ?:
         ((f.fileEntry.name.replaceFirst(Regex(""".*[/\\]"""), "")