[Gradle, JS] Fix tests

This commit is contained in:
Ilya Goncharov
2022-08-04 21:29:26 +02:00
committed by Space Team
parent 462c53d566
commit 715ba5c59f
5 changed files with 5 additions and 5 deletions
@@ -399,7 +399,7 @@ class Kotlin2JsGradlePluginIT : AbstractKotlin2JsGradlePluginIT(false) {
val baseBuildscript = baseSubproject.buildGradleKts val baseBuildscript = baseSubproject.buildGradleKts
val libBuildscript = libSubproject.buildGradleKts val libBuildscript = libSubproject.buildGradleKts
baseBuildscript.modify { baseBuildscript.modify {
it.replace("js(\"both\")", "js(\"both\") { moduleName = \"base2\" }") it.replace("js(\"both\")", "js(\"both\") { (this as org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget).legacyTarget?.moduleName = \"base2\" }")
} }
libBuildscript.modify { libBuildscript.modify {
it.replace("implementation(project(\":base\"))", "implementation(files(\"${normalizePath(originalBaseJar.toString())}\"))") it.replace("implementation(project(\":base\"))", "implementation(files(\"${normalizePath(originalBaseJar.toString())}\"))")
@@ -15,7 +15,7 @@ repositories {
mavenCentral() mavenCentral()
} }
kotlin.targets.fromPreset(kotlin.presets.js, 'nodeJs') { kotlin.targets.fromPreset(kotlin.presets.jsLegacy, 'nodeJs') {
nodejs() nodejs()
} }
@@ -15,7 +15,7 @@ repositories {
mavenCentral() mavenCentral()
} }
kotlin.targets.fromPreset(kotlin.presets.js, 'browser') { kotlin.targets.fromPreset(kotlin.presets.jsLegacy, 'browser') {
browser() browser()
} }
@@ -1,5 +1,5 @@
apply plugin: 'kotlin-platform-common' apply plugin: 'kotlin-platform-common'
dependencies { dependencies {
implementation 'com.example:sample-lib:1.0' implementation 'com.example:sample-lib:1.0'
} }
@@ -95,7 +95,7 @@ abstract class KotlinJsIrLink @Inject constructor(
@get:IgnoreEmptyDirectories @get:IgnoreEmptyDirectories
@get:NormalizeLineEndings @get:NormalizeLineEndings
@get:InputDirectory @get:InputDirectory
@get:PathSensitive(PathSensitivity.RELATIVE) @get:PathSensitive(PathSensitivity.NAME_ONLY)
internal abstract val entryModule: DirectoryProperty internal abstract val entryModule: DirectoryProperty
@get:Internal @get:Internal