More updates for Kotlin 2.1.0 (#5207)

Author: eymar

ci/templates/multiplatform-template/common/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop")
 
     sourceSets {

components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt

@@ -4,6 +4,7 @@
  */
 package org.jetbrains.compose.resources.vector.xmldom
 
+import kotlinx.cinterop.ObjCSignatureOverride
 import platform.Foundation.NSError
 import platform.Foundation.NSString
 import platform.Foundation.NSUTF8StringEncoding
@@ -91,6 +92,7 @@ private class DomXmlParser : NSObject(), NSXMLParserDelegateProtocol {
         nodeStack.add(node)
     }
 
+    @ObjCSignatureOverride
     override fun parser(parser: NSXMLParser, foundCharacters: String) {
         nodeStack.lastOrNull()?.let { node ->
             node.textContent = node.textContent.orEmpty() + foundCharacters
@@ -116,15 +118,18 @@ private class DomXmlParser : NSObject(), NSXMLParserDelegateProtocol {
         curPrefixMap = curPrefixMapInverted.entries.associateBy({ it.value }, { it.key })
     }
 
+    @ObjCSignatureOverride
     override fun parser(parser: NSXMLParser, didEndMappingPrefix: String) {
         curPrefixMapInverted.remove(didEndMappingPrefix)
         curPrefixMap = curPrefixMapInverted.entries.associateBy({ it.value }, { it.key })
     }
 
+    @ObjCSignatureOverride
     override fun parser(parser: NSXMLParser, validationErrorOccurred: NSError) {
         throw MalformedXMLException("validation error occurred")
     }
 
+    @ObjCSignatureOverride
     override fun parser(parser: NSXMLParser, parseErrorOccurred: NSError) {
         throw MalformedXMLException("parse error occurred")
     }

html/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js

@@ -9,7 +9,7 @@ const NewReporter = function(baseReporterDecorator, config, emitter) {
     const fs = require('fs');
     // const kotlinVersion = fs.readFileSync(path.resolve(__dirname, "../../../buildSrc/build/kotlin.version"), 'utf8');
 
-    const kotlinReporterModule = require(`../../../build/js/node_modules/kotlin-test-js-runner/karma-kotlin-reporter`);
+    const kotlinReporterModule = require(`../../../build/js/packages_imported/kotlin-test-js-runner/0.0.1/karma-kotlin-reporter`);
     const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1];
     this.$inject = KotlinReporter.$inject