From ba8cc877fd182495e775e49c95e04c9648a19a7e Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 3 Jan 2023 17:02:16 +0100 Subject: [PATCH] [Gradle, JS] Remove module dom-api-compat --- .gitignore | 1 - .../kotlin-dom-api-compat/build.gradle.kts | 47 ------------------- libraries/stdlib/js-ir/build.gradle.kts | 4 -- .../build.gradle.kts | 1 - settings.gradle | 2 - 5 files changed, 55 deletions(-) delete mode 100644 libraries/kotlin-dom-api-compat/build.gradle.kts diff --git a/.gitignore b/.gitignore index 86331f5d200..7ac3a08e1f0 100644 --- a/.gitignore +++ b/.gitignore @@ -57,7 +57,6 @@ build/ .idea/artifacts/kotlin_stdlib_js_ir_* .idea/artifacts/kotlin_test_js_ir_* .idea/artifacts/kotlin_stdlib_wasm_* -.idea/artifacts/kotlin_dom_api_compat_* .idea/artifacts/kotlinx_atomicfu_runtime_* .idea/artifacts/kotlinx_cli_jvm_* .idea/jarRepositories.xml diff --git a/libraries/kotlin-dom-api-compat/build.gradle.kts b/libraries/kotlin-dom-api-compat/build.gradle.kts deleted file mode 100644 index 2dc09ef4e7c..00000000000 --- a/libraries/kotlin-dom-api-compat/build.gradle.kts +++ /dev/null @@ -1,47 +0,0 @@ -import plugins.configureDefaultPublishing - -plugins { - `maven-publish` - kotlin("js") -} - -val jsStdlibSources = "${projectDir}/../stdlib/js/src" - -kotlin { - js(IR) { - sourceSets { - val main by getting { - kotlin.srcDir("$jsStdlibSources/org.w3c") - kotlin.srcDir("$jsStdlibSources/kotlinx") - kotlin.srcDir("$jsStdlibSources/kotlin/browser") - kotlin.srcDir("$jsStdlibSources/kotlin/dom") - - dependencies { - api(project(":kotlin-stdlib-js")) - } - } - } - } -} - -tasks.withType().configureEach { - kotlinOptions.freeCompilerArgs += listOf( - "-Xallow-kotlin-package", - "-opt-in=kotlin.ExperimentalMultiplatform", - "-opt-in=kotlin.contracts.ExperimentalContracts", - "-Xfriend-modules=${libraries.joinToString(File.pathSeparator) { it.absolutePath }}" - ) - kotlinOptions.allWarningsAsErrors = true -} - - - -publishing { - publications { - create("maven") { - from(components["kotlin"]) - } - } -} - -configureDefaultPublishing() \ No newline at end of file diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index 80445de76ef..5747a2023c2 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -61,10 +61,6 @@ val jsMainSources by task { val excluded = listOf( // stdlib/js/src/generated is used exclusively for current `js-v1` backend. "libraries/stdlib/js/src/generated/**", - "libraries/stdlib/js/src/kotlin/browser", - "libraries/stdlib/js/src/kotlin/dom", - "libraries/stdlib/js/src/org.w3c", - "libraries/stdlib/js/src/kotlinx", // JS-specific optimized version of emptyArray() already defined "core/builtins/src/kotlin/ArrayIntrinsics.kt" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index e5ac6769508..b551b5829f1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -324,7 +324,6 @@ tasks.withType { dependsOnKotlinGradlePluginInstall() dependsOn(":gradle:android-test-fixes:install") dependsOn(":examples:annotation-processor-example:install") - dependsOn(":kotlin-dom-api-compat:install") systemProperty("kotlinVersion", rootProject.extra["kotlinVersion"] as String) systemProperty("runnerGradleVersion", gradle.gradleVersion) diff --git a/settings.gradle b/settings.gradle index 2179e7a790e..33502d4001b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -600,7 +600,6 @@ if (buildProperties.inJpsBuildIdeaSync) { ":kotlin-stdlib", ":kotlin-stdlib-js", ":kotlin-stdlib-js-ir", - ":kotlin-dom-api-compat", ":kotlin-stdlib-js-ir-minimal-for-test", ":kotlin-stdlib-wasm", ":kotlin-stdlib-jdk7", @@ -622,7 +621,6 @@ if (buildProperties.inJpsBuildIdeaSync) { project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib/jvm" as File project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js-v1" as File project(':kotlin-stdlib-js-ir').projectDir = "$rootDir/libraries/stdlib/js-ir" as File - project(':kotlin-dom-api-compat').projectDir = "$rootDir/libraries/kotlin-dom-api-compat" as File project(':kotlin-stdlib-wasm').projectDir = "$rootDir/libraries/stdlib/wasm" as File project(':kotlin-stdlib-js-ir-minimal-for-test').projectDir = "$rootDir/libraries/stdlib/js-ir-minimal-for-test" as File project(':kotlin-stdlib-jdk7').projectDir = "$rootDir/libraries/stdlib/jdk7" as File