MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[air] Make fleet.junit library wasmJS-compatible

Browse Source 
GitOrigin-RevId: 174542162aee24ccc5e6e0afeabfa575ff859c45
This commit is contained in:
Mikhail Zinchenko
2026-01-16 22:34:46 +00:00
committed by intellij-monorepo-bot
parent e1689d2898
commit 877e50dbc0
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fleet/build/fs/gradlebuild/build.gradle.kts
+1 -1
View File
@@ -65,7 +65,7 @@ kotlin {
isTransitive = false
}
}
sourceSets.jvmTest.dependencies {
sourceSets.commonTest.dependencies {
implementation(project(":fleet.junit"))
}
// KOTLIN__MARKER_END
fleet/build/http/gradlebuild/build.gradle.kts
+1 -1
View File
@@ -65,7 +65,7 @@ kotlin {
api(project(":fleet.ktor.client.core"))
implementation(project(":fleet.build.fs"))
}
sourceSets.jvmTest.dependencies {
sourceSets.commonTest.dependencies {
implementation(project(":fleet.junit"))
}
// KOTLIN__MARKER_END
fleet/build/s3/gradlebuild/build.gradle.kts
-2
View File
@@ -71,8 +71,6 @@ kotlin {
implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.test.jvm1610416103.get().let { "${it.group}:kotlinx-coroutines-test:${it.version}" }) {
isTransitive = false
}
}
sourceSets.jvmTest.dependencies {
implementation(project(":fleet.junit"))
}
// KOTLIN__MARKER_END
fleet/codecache/test/gradlebuild/build.gradle.kts
+1 -3
View File
@@ -56,13 +56,11 @@ kotlin {
implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.core.jvm1739247612.get().let { "${it.group}:kotlinx-serialization-core:${it.version}" }) {
isTransitive = false
}
implementation(project(":fleet.junit"))
implementation(project(":fleet.codecache"))
implementation(project(":fleet.bundles"))
implementation(project(":fleet.util.network"))
implementation(project(":fleet.ktor.client.core"))
}
sourceSets.jvmTest.dependencies {
implementation(project(":fleet.junit"))
}
// KOTLIN__MARKER_END
}
fleet/junit/gradlebuild/build.gradle.kts
+12 -4
View File
@@ -7,7 +7,6 @@ plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
alias(libs.plugins.dokka)
// GRADLE_PLUGINS__MARKER_START
id("fleet-module")
// GRADLE_PLUGINS__MARKER_END
@@ -24,6 +23,9 @@ fleetModule {
kotlin {
// KOTLIN__MARKER_START
jvm {}
wasmJs {
browser {}
}
sourceSets.commonMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcCommonMain")) }
sourceSets.commonMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesCommonMain")) }
sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcCommonTest")) }
@@ -34,7 +36,16 @@ kotlin {
sourceSets.jvmTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmTest")) }
configureAtMostOneJvmTargetOrThrow { compilations.named("test") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.projectDirectory.dir("../srcJvmTest")) } } }
sourceSets.jvmTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesJvmTest")) }
sourceSets.wasmJsMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsMain")) }
sourceSets.wasmJsMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsMain")) }
sourceSets.wasmJsTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsTest")) }
sourceSets.wasmJsTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsTest")) }
sourceSets.commonMain.dependencies {
api(jps.org.jetbrains.kotlin.kotlin.test542871666.get().let { "${it.group}:${it.name}:${it.version}" }) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
}
}
sourceSets.jvmMain.dependencies {
api(jps.org.junit.jupiter.junit.jupiter.api1894444205.get())
api(jps.org.junit.jupiter.junit.jupiter.params1101092435.get().let { "${it.group}:${it.name}:${it.version}" }) {
isTransitive = false
@@ -53,9 +64,6 @@ kotlin {
api(jps.org.jetbrains.kotlin.kotlin.test.junit5960045374.get().let { "${it.group}:${it.name}:${it.version}" }) {
isTransitive = false
}
api(jps.org.jetbrains.kotlin.kotlin.test542871666.get().let { "${it.group}:${it.name}:${it.version}" }) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
}
}
// KOTLIN__MARKER_END
}
fleet/util/codepoints/test/gradlebuild/build.gradle.kts
-2
View File
@@ -58,8 +58,6 @@ kotlin {
exclude(group = "org.jetbrains", module = "annotations")
}
implementation(project(":fleet.util.codepoints"))
}
sourceSets.jvmTest.dependencies {
implementation(project(":fleet.junit"))
}
// KOTLIN__MARKER_END