diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts index a3a3d357e1e..a3e55ea073a 100644 --- a/libraries/stdlib/build.gradle.kts +++ b/libraries/stdlib/build.gradle.kts @@ -348,7 +348,6 @@ kotlin { 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", diff --git a/libraries/stdlib/js-ir/src/generated/.gitattributes b/libraries/stdlib/js/src/generated/.gitattributes similarity index 100% rename from libraries/stdlib/js-ir/src/generated/.gitattributes rename to libraries/stdlib/js/src/generated/.gitattributes diff --git a/libraries/stdlib/js-ir/src/generated/_ArraysJs.kt b/libraries/stdlib/js/src/generated/_ArraysJs.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_ArraysJs.kt rename to libraries/stdlib/js/src/generated/_ArraysJs.kt diff --git a/libraries/stdlib/js-ir/src/generated/_CharCategories.kt b/libraries/stdlib/js/src/generated/_CharCategories.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_CharCategories.kt rename to libraries/stdlib/js/src/generated/_CharCategories.kt diff --git a/libraries/stdlib/js-ir/src/generated/_CollectionsJs.kt b/libraries/stdlib/js/src/generated/_CollectionsJs.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_CollectionsJs.kt rename to libraries/stdlib/js/src/generated/_CollectionsJs.kt diff --git a/libraries/stdlib/js-ir/src/generated/_ComparisonsJs.kt b/libraries/stdlib/js/src/generated/_ComparisonsJs.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_ComparisonsJs.kt rename to libraries/stdlib/js/src/generated/_ComparisonsJs.kt diff --git a/libraries/stdlib/js-ir/src/generated/_DigitChars.kt b/libraries/stdlib/js/src/generated/_DigitChars.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_DigitChars.kt rename to libraries/stdlib/js/src/generated/_DigitChars.kt diff --git a/libraries/stdlib/js-ir/src/generated/_LetterChars.kt b/libraries/stdlib/js/src/generated/_LetterChars.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_LetterChars.kt rename to libraries/stdlib/js/src/generated/_LetterChars.kt diff --git a/libraries/stdlib/js-ir/src/generated/_OtherLowercaseChars.kt b/libraries/stdlib/js/src/generated/_OtherLowercaseChars.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_OtherLowercaseChars.kt rename to libraries/stdlib/js/src/generated/_OtherLowercaseChars.kt diff --git a/libraries/stdlib/js-ir/src/generated/_OtherUppercaseChars.kt b/libraries/stdlib/js/src/generated/_OtherUppercaseChars.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_OtherUppercaseChars.kt rename to libraries/stdlib/js/src/generated/_OtherUppercaseChars.kt diff --git a/libraries/stdlib/js-ir/src/generated/_StringsJs.kt b/libraries/stdlib/js/src/generated/_StringsJs.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_StringsJs.kt rename to libraries/stdlib/js/src/generated/_StringsJs.kt diff --git a/libraries/stdlib/js-ir/src/generated/_TitlecaseMappings.kt b/libraries/stdlib/js/src/generated/_TitlecaseMappings.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_TitlecaseMappings.kt rename to libraries/stdlib/js/src/generated/_TitlecaseMappings.kt diff --git a/libraries/stdlib/js-ir/src/generated/_UArraysJs.kt b/libraries/stdlib/js/src/generated/_UArraysJs.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_UArraysJs.kt rename to libraries/stdlib/js/src/generated/_UArraysJs.kt diff --git a/libraries/stdlib/js-ir/src/generated/_WhitespaceChars.kt b/libraries/stdlib/js/src/generated/_WhitespaceChars.kt similarity index 100% rename from libraries/stdlib/js-ir/src/generated/_WhitespaceChars.kt rename to libraries/stdlib/js/src/generated/_WhitespaceChars.kt diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt index 2f3b7085737..5050c166ca1 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt @@ -43,7 +43,6 @@ fun main(args: Array) { targetBaseDirs[KotlinTarget.Common] = baseDir.resolveExistingDir("libraries/stdlib/common/src/generated") targetBaseDirs[KotlinTarget.JVM] = baseDir.resolveExistingDir("libraries/stdlib/jvm/src/generated") targetBaseDirs[KotlinTarget.JS] = baseDir.resolveExistingDir("libraries/stdlib/js/src/generated") - targetBaseDirs[KotlinTarget.JS_IR] = baseDir.resolveExistingDir("libraries/stdlib/js-ir/src/generated") targetBaseDirs[KotlinTarget.WASM] = baseDir.resolveExistingDir("libraries/stdlib/wasm/src/generated") targetBaseDirs[KotlinTarget.Native] = baseDir.resolveExistingDir("kotlin-native/runtime/src/main/kotlin/generated") } diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt index 2418839b7a0..5359f326e90 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt @@ -121,10 +121,6 @@ fun main(args: Array) { addRangesGenerators(jsGeneratedDir, KotlinTarget.JS) oneToOneMappingsGenerators.add(MappingsGenerator.forTitlecase(jsGeneratedDir.resolve("_TitlecaseMappings.kt"))) - val jsIrGeneratedDir = baseDir.resolve("libraries/stdlib/js-ir/src/generated/") - addRangesGenerators(jsIrGeneratedDir, KotlinTarget.JS_IR) - oneToOneMappingsGenerators.add(MappingsGenerator.forTitlecase(jsIrGeneratedDir.resolve("_TitlecaseMappings.kt"))) - val nativeGeneratedDir = baseDir.resolve("kotlin-native/runtime/src/main/kotlin/generated/") addRangesGenerators(nativeGeneratedDir, KotlinTarget.Native) addOneToOneMappingsGenerators(nativeGeneratedDir, KotlinTarget.Native) diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt index a70ec3af73e..5bd67a81e6b 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt @@ -120,8 +120,7 @@ enum class Backend { enum class KotlinTarget(val platform: Platform, val backend: Backend) { Common(Platform.Common, Backend.Any), JVM(Platform.JVM, Backend.Any), - JS(Platform.JS, Backend.Legacy), - JS_IR(Platform.JS, Backend.IR), + JS(Platform.JS, Backend.IR), WASM(Platform.Native, Backend.Wasm), Native(Platform.Native, Backend.IR);