[kotlin-test] Drop subprojects unneeded anymore KT-61969

build.gradle.kts

@@ -457,12 +457,6 @@ val coreLibProjects by extra {
         ":kotlin-stdlib-jdk7",
         ":kotlin-stdlib-jdk8",
         ":kotlin-test",
-        ":kotlin-test:kotlin-test-annotations-common",
-        ":kotlin-test:kotlin-test-common",
-        ":kotlin-test:kotlin-test-jvm",
-        ":kotlin-test:kotlin-test-junit",
-        ":kotlin-test:kotlin-test-junit5",
-        ":kotlin-test:kotlin-test-testng",
         ":kotlin-reflect"
     )
 }
@@ -723,7 +717,6 @@ tasks {
     register("coreLibsTest") {
         (coreLibProjects + listOfNotNull(
             ":kotlin-stdlib:samples",
-            ":kotlin-test:kotlin-test-js-ir".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
             ":kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
             ":kotlinx-metadata-jvm",
             ":tools:binary-compatibility-validator",

libraries/kotlin.test/annotations-common/build.gradle

@@ -1,24 +0,0 @@
-description = 'Kotlin Test Annotations Common'
-
-apply plugin: 'kotlin-platform-common'
-
-JvmToolchain.updateJvmTarget(project, "1.8")
-
-dependencies {
-    api RepoDependencies.kotlinStdlib(project)
-    testApi project(":kotlin-test:kotlin-test-common")
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
-    kotlinOptions.freeCompilerArgs += [
-        "-Xallow-kotlin-package",
-        "-Xexpect-actual-classes",
-    ]
-}
-
-jar {
-    LibrariesCommon.manifestAttributes(project, manifest, 'Test')
-}
-
-RepoArtifacts.sourcesJar(project)
-RepoArtifacts.javadocJar(project)

libraries/kotlin.test/common/build.gradle

@@ -1,31 +0,0 @@
-description = 'Kotlin Test Common'
-
-apply plugin: 'kotlin-platform-common'
-
-JvmToolchain.updateJvmTarget(project, "1.8")
-
-dependencies {
-    api RepoDependencies.kotlinStdlib(project)
-    testApi project(":kotlin-test:kotlin-test-annotations-common")
-}
-
-jar {
-    LibrariesCommon.manifestAttributes(project, manifest, 'Test')
-}
-
-RepoArtifacts.sourcesJar(project)
-RepoArtifacts.javadocJar(project)
-
-tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
-    kotlinOptions.freeCompilerArgs += ["-Xallow-kotlin-package", "-opt-in=kotlin.RequiresOptIn"]
-}
-
-compileKotlinCommon {
-    kotlinOptions {
-        freeCompilerArgs += [
-                "-module-name", project.name,
-                "-opt-in=kotlin.contracts.ExperimentalContracts",
-        ]
-    }
-}
-

libraries/kotlin.test/js-ir/build.gradle.kts

@@ -1,72 +0,0 @@
-import org.gradle.api.tasks.bundling.Jar
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
-
-plugins {
-    kotlin("multiplatform")
-}
-
-description = "Kotlin Test for JS"
-base.archivesName = "kotlin-test-js"
-
-val commonMainSources by task<Sync> {
-    from(
-        "$rootDir/libraries/kotlin.test/common/src/main/kotlin",
-        "$rootDir/libraries/kotlin.test/annotations-common/src/main/kotlin"
-    )
-    into(layout.buildDirectory.dir("commonMainSources"))
-}
-
-val commonTestSources by task<Sync> {
-    from("$rootDir/libraries/kotlin.test/common/src/test/kotlin")
-    into(layout.buildDirectory.dir("commonTestSources"))
-}
-
-val jsMainSources by task<Sync> {
-    from("$rootDir/libraries/kotlin.test/js/src/main/kotlin")
-    into(layout.buildDirectory.dir("jsMainSources"))
-}
-
-kotlin {
-    js(IR) {
-        nodejs()
-    }
-
-    sourceSets {
-        named("commonMain") {
-            dependencies {
-                api(kotlinStdlib())
-            }
-            kotlin.srcDir(commonMainSources)
-        }
-        named("commonTest") {
-            kotlin.srcDir(commonTestSources)
-        }
-        named("jsMain") {
-            kotlin.srcDir(jsMainSources)
-        }
-    }
-}
-
-tasks.withType<KotlinCompile<*>>().configureEach {
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-Xallow-kotlin-package",
-        "-opt-in=kotlin.ExperimentalMultiplatform",
-        "-opt-in=kotlin.contracts.ExperimentalContracts",
-        "-Xexpect-actual-classes"
-    )
-}
-
-tasks.named("compileKotlinJs") {
-    (this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test"
-}
-
-@Suppress("UNUSED_VARIABLE")
-tasks {
-    val jsJar by existing(Jar::class) {
-        archiveAppendix = null
-        manifestAttributes(manifest, "Test")
-    }
-    val jsSourcesJar by existing(org.gradle.jvm.tasks.Jar::class) {
-        archiveAppendix = null
-    }
-}

libraries/kotlin.test/junit/build.gradle

@@ -1,50 +0,0 @@
-description = 'Kotlin Test JUnit'
-
-apply plugin: 'kotlin-platform-jvm'
-
-JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
-
-def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
-
-sourceSets {
-    if (includeJava9) {
-        java9
-    }
-}
-
-dependencies {
-    expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    api project(':kotlin-test:kotlin-test-jvm')
-    api('junit:junit:4.13.2')
-}
-
-
-jar {
-    LibrariesCommon.manifestAttributes(project, manifest, 'Test', true)
-    if (includeJava9) {
-        from sourceSets.java9.output
-    }
-}
-
-RepoArtifacts.sourcesJar(project)
-RepoArtifacts.javadocJar(project)
-
-compileKotlin {
-    kotlinOptions.freeCompilerArgs = [
-        "-Xallow-kotlin-package",
-        "-Xexpect-actual-classes",
-    ]
-    kotlinOptions.moduleName = project.name
-}
-
-compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = [
-        "-Xallow-kotlin-package",
-    ]
-}
-
-LibrariesCommon.configureFrontendIr(project)
-
-if (includeJava9) {
-    LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.junit')
-}

libraries/kotlin.test/junit5/build.gradle

@@ -1,55 +0,0 @@
-description = 'Kotlin Test JUnit 5'
-
-apply plugin: 'kotlin-platform-jvm'
-
-def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
-
-sourceSets {
-    if (includeJava9) {
-        java9
-    }
-}
-
-project.ext["jpsLibraryPath"] = rootProject.distLibDir
-
-dependencies {
-    expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    api project(':kotlin-test:kotlin-test-jvm')
-
-    api("org.junit.jupiter:junit-jupiter-api:5.0.0")
-    testRuntimeOnly(libs.junit.jupiter.engine)
-}
-
-jar {
-    LibrariesCommon.manifestAttributes(project, manifest, 'Test', true)
-    if (includeJava9) {
-        from sourceSets.java9.output
-    }
-}
-
-RepoArtifacts.sourcesJar(project)
-RepoArtifacts.javadocJar(project)
-
-compileKotlin {
-    kotlinOptions.freeCompilerArgs = [
-        "-Xallow-kotlin-package",
-        "-Xexpect-actual-classes",
-    ]
-    kotlinOptions.moduleName = project.name
-}
-
-compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = [
-        "-Xallow-kotlin-package",
-    ]
-}
-
-LibrariesCommon.configureFrontendIr(project)
-
-if (includeJava9) {
-    LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.junit5')
-}
-
-test {
-    useJUnitPlatform()
-}

libraries/kotlin.test/jvm/build.gradle

@@ -1,58 +0,0 @@
-description = 'Kotlin Test'
-
-apply plugin: 'kotlin-platform-jvm'
-
-base {
-    archivesName = 'kotlin-test'
-}
-
-JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
-
-def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
-
-sourceSets {
-    if (includeJava9) {
-        java9
-    }
-}
-
-dependencies {
-    expectedBy project(':kotlin-test:kotlin-test-common')
-    api(RepoDependencies.kotlinStdlib(project))
-    testApi(project(":kotlin-test:kotlin-test-junit"))
-    testApi('junit:junit:4.13.2')
-}
-
-jar {
-    LibrariesCommon.manifestAttributes(project, manifest, 'Test', true)
-    if (includeJava9) {
-        from sourceSets.java9.output
-    }
-}
-
-RepoArtifacts.sourcesJar(project)
-RepoArtifacts.javadocJar(project)
-
-compileKotlin {
-    compilerOptions {
-        freeCompilerArgs = [
-                "-Xallow-kotlin-package",
-                "-opt-in=kotlin.contracts.ExperimentalContracts",
-                "-opt-in=kotlin.RequiresOptIn",
-        ]
-        moduleName = base.archivesName
-    }
-}
-
-compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = [
-        "-Xallow-kotlin-package",
-        "-opt-in=kotlin.RequiresOptIn",
-    ]
-}
-
-LibrariesCommon.configureFrontendIr(project)
-
-if (includeJava9) {
-    LibrariesCommon.configureJava9Compilation(project, 'kotlin.test')
-}

libraries/kotlin.test/testng/build.gradle

@@ -1,56 +0,0 @@
-description = 'Kotlin Test TestNG'
-
-apply plugin: 'kotlin-platform-jvm'
-
-JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
-
-def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
-
-sourceSets {
-    if (includeJava9) {
-        java9
-    }
-}
-
-dependencies {
-    expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    api project(':kotlin-test:kotlin-test-jvm')
-    api('org.testng:testng:6.13.1')
-    if (includeJava9) {
-        java9CompileOnly('org.testng:testng:7.0.0')
-    }
-}
-
-jar {
-    LibrariesCommon.manifestAttributes(project, manifest, 'Test', true)
-    if (includeJava9) {
-        from sourceSets.java9.output
-    }
-}
-
-RepoArtifacts.sourcesJar(project)
-RepoArtifacts.javadocJar(project)
-
-compileKotlin {
-    kotlinOptions.freeCompilerArgs = [
-        "-Xallow-kotlin-package",
-        "-Xexpect-actual-classes",
-    ]
-    kotlinOptions.moduleName = project.name
-}
-
-compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = [
-        "-Xallow-kotlin-package",
-    ]
-}
-
-LibrariesCommon.configureFrontendIr(project)
-
-if (includeJava9) {
-    LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.testng')
-}
-
-test {
-    useTestNG()
-}

libraries/kotlin.test/wasm/js/build.gradle.kts

@@ -1,14 +0,0 @@
-import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
-
-plugins {
-    kotlin("multiplatform")
-}
-
-configureWasmKotlinTest(
-    wasmTargetParameter = "wasm-js",
-    wasmTargetAttribute = KotlinWasmTargetAttribute.js,
-    targetSourceDir = "$rootDir/libraries/kotlin.test/wasm/js/src/main/kotlin",
-    stdDependencyName = ":kotlin-stdlib"
-) { extensionBody ->
-    kotlin(extensionBody)
-}

libraries/kotlin.test/wasm/wasi/build.gradle.kts

@@ -1,14 +0,0 @@
-import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
-
-plugins {
-    kotlin("multiplatform")
-}
-
-configureWasmKotlinTest(
-    wasmTargetParameter = "wasm-wasi",
-    wasmTargetAttribute = KotlinWasmTargetAttribute.wasi,
-    targetSourceDir = "$rootDir/libraries/kotlin.test/wasm/wasi/src/main/kotlin",
-    stdDependencyName = ":kotlin-stdlib"
-) { extensionBody ->
-    kotlin(extensionBody)
-}

libraries/stdlib/common/build.gradle

@@ -23,17 +23,10 @@ sourceSets {
         }
     }
     test {
-        if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
-        kotlin {
-            srcDir commonTestSrcDir
-            srcDir 'test'
-        }
     }
 }
 
 dependencies {
-    testApi project(":kotlin-test:kotlin-test-common")
-    testApi project(":kotlin-test:kotlin-test-annotations-common")
 }
 
 compileKotlinCommon {

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts

@@ -135,11 +135,7 @@ fun Project.configureKotlinCompilationOptions() {
         val projectsWithForced19LanguageVersion = coreLibProjects + listOf(
             ":kotlin-stdlib-jvm-minimal-for-test",
             ":kotlin-stdlib-js-ir-minimal-for-test",
-            ":kotlin-stdlib-wasm-js",
-            ":kotlin-stdlib-wasm-wasi",
             ":kotlin-dom-api-compat",
-            ":kotlin-test:kotlin-test-wasm-js",
-            ":kotlin-test:kotlin-test-wasm-wasi",
         )
 
         tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().configureEach {

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/wasm/wasmKotlinTest.kt

@@ -1,107 +0,0 @@
-/*
- * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-import org.gradle.api.Project
-import org.gradle.api.tasks.Sync
-import org.gradle.api.tasks.bundling.Jar
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.named
-import org.gradle.kotlin.dsl.register
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
-
-private fun Project.createCommonMainSources() = tasks.register("commonMainSources", Sync::class.java) {
-    from(
-        "$rootDir/libraries/kotlin.test/common/src/main/kotlin",
-        "$rootDir/libraries/kotlin.test/annotations-common/src/main/kotlin",
-    )
-    into(layout.buildDirectory.dir("commonMainSources"))
-}
-private fun Project.createCommonWasmSources() = tasks.register<Sync>("commonWasmSources") {
-    from(
-        "$rootDir/libraries/kotlin.test/wasm/src/main/kotlin"
-    )
-    into(layout.buildDirectory.dir("commonWasmSources"))
-}
-
-fun Project.configureWasmKotlinTest(
-    wasmTargetParameter: String,
-    wasmTargetAttribute: KotlinWasmTargetAttribute,
-    targetSourceDir: String,
-    stdDependencyName: String,
-    withKotlinMPP: (KotlinMultiplatformExtension.() -> Unit) -> Unit
-) {
-    val commonMainSources = createCommonMainSources()
-    val commonWasmSources = createCommonWasmSources()
-
-    withKotlinMPP {
-        @Suppress("DEPRECATION")
-        @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
-        wasm("wasm") {
-            nodejs()
-            attributes {
-                attribute(KotlinWasmTargetAttribute.wasmTargetAttribute, wasmTargetAttribute)
-            }
-        }
-
-        sourceSets {
-            val commonMain = sourceSets.named("commonMain") {
-                dependencies {
-                    api(project(stdDependencyName))
-                }
-                kotlin.srcDir(commonMainSources)
-            }
-
-            val commonWasm = sourceSets.create("commonWasm") {
-                dependsOn(commonMain.get())
-                kotlin.srcDir(commonWasmSources)
-            }
-
-            sourceSets.named("wasmMain") {
-                dependsOn(commonWasm)
-                kotlin.srcDir(targetSourceDir)
-            }
-        }
-
-        tasks.register<Jar>("sourcesJar") {
-            dependsOn(commonMainSources)
-            archiveClassifier.set("sources")
-            from(sourceSets["commonMain"].kotlin) {
-                into("commonMain")
-            }
-            from(sourceSets["commonWasm"].kotlin) {
-                into("commonWasm")
-            }
-            from(sourceSets["wasmMain"].kotlin) {
-                into("wasmMain")
-            }
-        }
-    }
-
-    tasks.withType<KotlinCompile<*>>().configureEach {
-        kotlinOptions.freeCompilerArgs += listOf(
-            "-Xallow-kotlin-package",
-            "-Xexpect-actual-classes",
-            "-opt-in=kotlin.ExperimentalMultiplatform",
-            "-opt-in=kotlin.contracts.ExperimentalContracts",
-            "-Xwasm-target=$wasmTargetParameter"
-        )
-    }
-
-    tasks.named("compileKotlinWasm", KotlinCompile::class.java) {
-        kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test"
-        dependsOn(commonMainSources)
-    }
-
-    tasks.named<Jar>("wasmJar") {
-        manifestAttributes(manifest, "Test")
-    }
-
-    tasks.register<Jar>("emptyJavadocJar") {
-        archiveClassifier.set("javadoc")
-    }
-}

settings.gradle

@@ -176,12 +176,6 @@ include ":kotlin-imports-dumper-compiler-plugin",
         ":plugins:fir-plugin-prototype",
         ":plugins:fir-plugin-prototype:plugin-annotations",
         ":plugins:fir-plugin-prototype:fir-plugin-ic-test",
-        ":kotlin-test:kotlin-test-common",
-        ":kotlin-test:kotlin-test-annotations-common",
-        ":kotlin-test:kotlin-test-jvm",
-        ":kotlin-test:kotlin-test-junit",
-        ":kotlin-test:kotlin-test-junit5",
-        ":kotlin-test:kotlin-test-testng",
         ":kotlin-test-js-runner",
         ":kotlinx-metadata",
         ":kotlinx-metadata-jvm",
@@ -622,10 +616,7 @@ if (buildProperties.inJpsBuildIdeaSync) {
             ":tools:kotlin-stdlib-gen",
 
             ":kotlin-test",
-            ":kotlin-test:kotlin-test-js-ir",
             ":kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it",
-            ":kotlin-test:kotlin-test-wasm-js",
-            ":kotlin-test:kotlin-test-wasm-wasi",
             ":native:native.tests"
 
     project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File
@@ -643,10 +634,7 @@ if (buildProperties.inJpsBuildIdeaSync) {
     project(':tools:ide-plugin-dependencies-validator').projectDir = "$rootDir/libraries/tools/ide-plugin-dependencies-validator" as File
 
     project(':kotlin-test').projectDir = "$rootDir/libraries/kotlin.test" as File
-    project(':kotlin-test:kotlin-test-js-ir').projectDir = "$rootDir/libraries/kotlin.test/js-ir" as File
     project(':kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it').projectDir = "$rootDir/libraries/kotlin.test/js-ir/it" as File
-    project(':kotlin-test:kotlin-test-wasm-js').projectDir = "$rootDir/libraries/kotlin.test/wasm/js" as File
-    project(':kotlin-test:kotlin-test-wasm-wasi').projectDir = "$rootDir/libraries/kotlin.test/wasm/wasi" as File
     project(':native:native.tests').projectDir = "$rootDir/native/native.tests" as File
 }
 include ":compiler:android-tests"
@@ -654,12 +642,6 @@ include ":compiler:android-tests"
 rootProject.name = "kotlin"
 
 project(':kotlin-script-runtime').projectDir = "$rootDir/libraries/tools/script-runtime" as File
-project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/libraries/kotlin.test/common" as File
-project(':kotlin-test:kotlin-test-annotations-common').projectDir = "$rootDir/libraries/kotlin.test/annotations-common" as File
-project(':kotlin-test:kotlin-test-jvm').projectDir = "$rootDir/libraries/kotlin.test/jvm" as File
-project(':kotlin-test:kotlin-test-junit').projectDir = "$rootDir/libraries/kotlin.test/junit" as File
-project(':kotlin-test:kotlin-test-junit5').projectDir = "$rootDir/libraries/kotlin.test/junit5" as File
-project(':kotlin-test:kotlin-test-testng').projectDir = "$rootDir/libraries/kotlin.test/testng" as File
 project(':kotlin-test-js-runner').projectDir = "$rootDir/libraries/tools/kotlin-test-js-runner" as File
 project(':kotlin-reflect').projectDir = "$rootDir/libraries/reflect" as File
 project(':kotlin-reflect-api').projectDir = "$rootDir/libraries/reflect/api" as File