Fix JPS import after 7ae443ad

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")
 }

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

@@ -374,12 +374,16 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.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)
             }
         }