Add kotlin-dom-api-compat dependency

JetBrains/kotlin@688894a

Author: 3flex

core/build.gradle

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 
 plugins {
     id "com.github.gmazzo.buildconfig" version "3.1.0"
@@ -15,6 +16,18 @@ buildConfig {
     }
 }
 
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute(module("org.jetbrains.kotlin:kotlin-dom-api-compat"))
+                .using variant(module("org.jetbrains.kotlin:kotlin-dom-api-compat:$embedded_kotlin_version")) {
+            attributes {
+                attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
+                attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage, "kotlin-runtime"))
+            }
+        }
+    }
+}
+
 dependencies {
     compileOnly "com.google.auto.service:auto-service:1.0.1"
     kapt "com.google.auto.service:auto-service:1.0.1"
@@ -32,6 +45,7 @@ dependencies {
 
     // Include Kotlin/JS standard library in test classpath for auto loading
     testRuntimeOnly "org.jetbrains.kotlin:kotlin-stdlib-js"
+    testRuntimeOnly "org.jetbrains.kotlin:kotlin-dom-api-compat"
 
     // The Kotlin compiler should be near the end of the list because its .jar file includes
     // an obsolete version of Guava

core/src/main/kotlin/com/tschuchort/compiletesting/HostEnvironment.kt

@@ -27,6 +27,10 @@ internal object HostEnvironment {
         findInClasspath(kotlinDependencyRegex("kotlin-stdlib-js"))
     }
 
+    val kotlinDomApiCompatKlib: File? by lazy {
+        findInClasspath(kotlinDependencyRegex("kotlin-dom-api-compat"))
+    }
+
     val kotlinReflectJar: File? by lazy {
         findInClasspath(kotlinDependencyRegex("kotlin-reflect"))
     }
@@ -40,7 +44,7 @@ internal object HostEnvironment {
     }
 
     private fun kotlinDependencyRegex(prefix: String): Regex {
-        return Regex("$prefix(-[0-9]+\\.[0-9]+(\\.[0-9]+)?)([-0-9a-zA-Z]+)?\\.jar")
+        return Regex("$prefix(-[0-9]+\\.[0-9]+(\\.[0-9]+)?)([-0-9a-zA-Z]+)?(\\.jar|\\.klib)")
     }
 
     /** Tries to find a file matching the given [regex] in the host process' classpath */
@@ -60,7 +64,11 @@ internal object HostEnvironment {
 
         val classpaths = classGraph.classpathFiles
         val modules = classGraph.modules.mapNotNull { it.locationFile }
+        val klibs = System.getProperty("java.class.path")
+            .split(File.pathSeparator)
+            .filter { it.endsWith(".klib") }
+            .map(::File)
 
-        return (classpaths + modules).distinctBy(File::getAbsolutePath)
+        return (classpaths + modules + klibs).distinctBy(File::getAbsolutePath)
     }
 }

core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt

@@ -47,6 +47,15 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
     HostEnvironment.kotlinStdLibJsJar
   }
 
+  /**
+   * Path to the kotlin-dom-api-compat.klib
+   * If none is given, it will be searched for in the host
+   * process' classpaths
+   */
+  var kotlinStdLibDomApi: File? by default {
+    HostEnvironment.kotlinDomApiCompatKlib
+  }
+
   /**
    * Generate TypeScript declarations .d.ts file alongside JS file. Available in IR backend only
    */
@@ -84,7 +93,7 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
     args.outputDir = outputDir.absolutePath // -ir-output-dir
     args.moduleName = Paths.get(outputFileName).nameWithoutExtension  // -ir-output-name
     args.sourceMapBaseDirs = jsClasspath().joinToString(separator = File.pathSeparator)
-    args.libraries = listOfNotNull(kotlinStdLibJsJar).joinToString(separator = ":")
+    args.libraries = listOfNotNull(kotlinStdLibJsJar, kotlinStdLibDomApi).joinToString(separator = File.pathSeparator)
 
     args.irProduceKlibDir = irProduceKlibDir
     args.irProduceKlibFile = irProduceKlibFile