From e1c399b353833f1d0ab173863144c2fe12096602 Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Wed, 16 Aug 2023 15:30:04 +0200 Subject: [PATCH] Fix JPS import after 7ae443ad --- libraries/stdlib/jps-build/build.gradle.kts | 4 ++-- .../buildsrc-compat/src/main/kotlin/jps.gradle.kts | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/stdlib/jps-build/build.gradle.kts b/libraries/stdlib/jps-build/build.gradle.kts index bebf4a3cb6f..3ed89313e2c 100644 --- a/libraries/stdlib/jps-build/build.gradle.kts +++ b/libraries/stdlib/jps-build/build.gradle.kts @@ -25,6 +25,6 @@ dependencies { compilerLib("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$bootstrapKotlinVersion:sources") compilerLib("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$bootstrapKotlinVersion:sources") - commonStdlib("org.jetbrains.kotlin:kotlin-stdlib-common:$bootstrapKotlinVersion") - commonStdlibSources("org.jetbrains.kotlin:kotlin-stdlib-common:$bootstrapKotlinVersion:sources") + commonStdlib("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion:common") + commonStdlibSources("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion:common-sources") } \ No newline at end of file diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts index ff5042f3edf..01f3d67fa56 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts @@ -374,12 +374,16 @@ fun NamedDomainObjectContainer.dist() { directory("common") { // Use output-file-name when fixed https://github.com/JetBrains/gradle-idea-ext-plugin/issues/63 archive("kotlin-stdlib-common.jar") { - extractedDirectory(commonStdlib.singleFile) + extractedDirectory(commonStdlib.filter { + it.name.contains("stdlib") + }.singleFile) } // Use output-file-name when fixed https://github.com/JetBrains/gradle-idea-ext-plugin/issues/63 archive("kotlin-stdlib-common-sources.jar") { - extractedDirectory(commonStdlibSources.singleFile) + extractedDirectory(commonStdlibSources.filter { + it.name.contains("stdlib") + }.singleFile) } }