diff --git a/.idea/libraries/kotlinx_coroutines_core.xml b/.idea/libraries/kotlinx_coroutines_core.xml index 8cc81313f9cb..51dd96749aaf 100644 --- a/.idea/libraries/kotlinx_coroutines_core.xml +++ b/.idea/libraries/kotlinx_coroutines_core.xml @@ -1,18 +1,18 @@ - + - - e9b7e2b1262fd02fe63b08f636903ff36f453f08ae52190c78e3cbf19d777e42 + + f0c5dd90a0d1b5555a39a3151ef943bba54521d0b77caa06282c4584dbf94a68 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinx_coroutines_debug.xml b/.idea/libraries/kotlinx_coroutines_debug.xml index b6d4f1fcda39..f7f909414200 100644 --- a/.idea/libraries/kotlinx_coroutines_debug.xml +++ b/.idea/libraries/kotlinx_coroutines_debug.xml @@ -1,18 +1,18 @@ - + - - f8f56f19d2b29da511809c3345d2f0bf283bfb94a0a0d83f5b630e1424625723 + + 2c758b1d2fc710ce7bb9d83b66e10322cea522a10a7883babeb5469930d884c5 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinx_coroutines_guava.xml b/.idea/libraries/kotlinx_coroutines_guava.xml index d60beee58f63..4e4395c1369b 100644 --- a/.idea/libraries/kotlinx_coroutines_guava.xml +++ b/.idea/libraries/kotlinx_coroutines_guava.xml @@ -1,18 +1,18 @@ - + - - 61ff422fe859c2439d94727eb6dcd7ccadb5ba0d9cce4e181db1946209ef9bf6 + + 19aee8eb1611f2b3a2fc53a98288537b24892c1e2d1ab666bf87ebc0680036a0 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinx_coroutines_slf4j.xml b/.idea/libraries/kotlinx_coroutines_slf4j.xml index 16aaa52bb19d..51d234a17af6 100644 --- a/.idea/libraries/kotlinx_coroutines_slf4j.xml +++ b/.idea/libraries/kotlinx_coroutines_slf4j.xml @@ -1,18 +1,18 @@ - + - - 1d68dfc6ba67ec96ecb5a373dbd9fb557ce2210ffc2d74d6b528e4f1f73e7003 + + 5da8f9755dd622e7b2cf06e545cc33d2453a4fb44e5e31a8a957b97eaf44f386 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinx_coroutines_test.xml b/.idea/libraries/kotlinx_coroutines_test.xml index 0f99b170e1f0..f3c05fbfc2bb 100644 --- a/.idea/libraries/kotlinx_coroutines_test.xml +++ b/.idea/libraries/kotlinx_coroutines_test.xml @@ -1,18 +1,18 @@ - + - - 98b5c1291d9e473ce6df9823781a8a2170f1dfb4c30d985c56ff5242df2ff8f5 + + 9f9ade080368414b52d7e66b2cc48f65a2e369f98b2de2d56a6664428dd58131 - + - + \ No newline at end of file diff --git a/build/src/org/jetbrains/intellij/build/JewelMavenArtifacts.kt b/build/src/org/jetbrains/intellij/build/JewelMavenArtifacts.kt index b48cd0839ba6..43ea18a66e5a 100644 --- a/build/src/org/jetbrains/intellij/build/JewelMavenArtifacts.kt +++ b/build/src/org/jetbrains/intellij/build/JewelMavenArtifacts.kt @@ -133,7 +133,7 @@ internal object JewelMavenArtifacts { // * org.jetbrains:annotations // * org.jetbrains.skiko:* // * org.jetbrains.kotlin:kotlin-stdlib - // * com.intellij.platform:kotlinx-coroutines-core-jvm — we want to use the "normal" one, not the IJP fork + // * org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core-jvm — we want to use the "normal" one, not the IJP fork } } } diff --git a/fleet/build/cli/gradlebuild/build.gradle.kts b/fleet/build/cli/gradlebuild/build.gradle.kts index c819b58471bf..6536dee88540 100644 --- a/fleet/build/cli/gradlebuild/build.gradle.kts +++ b/fleet/build/cli/gradlebuild/build.gradle.kts @@ -64,7 +64,7 @@ kotlin { implementation(jps.org.jetbrains.kotlinx.kotlinx.io.core.jvm479158162.get().let { "${it.group}:kotlinx-io-core:${it.version}" }) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } api(jps.com.github.ajalt.clikt.clikt.core.jvm23167398.get().let { "${it.group}:clikt-core:${it.version}" }) { diff --git a/fleet/build/codecache/gradlebuild/build.gradle.kts b/fleet/build/codecache/gradlebuild/build.gradle.kts index b7c97956cc34..21dd656c9e7b 100644 --- a/fleet/build/codecache/gradlebuild/build.gradle.kts +++ b/fleet/build/codecache/gradlebuild/build.gradle.kts @@ -47,7 +47,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.slf4j.slf4j.api2013636515.get().let { "${it.group}:${it.name}:${it.version}" }) { diff --git a/fleet/build/http/gradlebuild/build.gradle.kts b/fleet/build/http/gradlebuild/build.gradle.kts index 6a650b00b6b6..40ff38fa5c68 100644 --- a/fleet/build/http/gradlebuild/build.gradle.kts +++ b/fleet/build/http/gradlebuild/build.gradle.kts @@ -48,7 +48,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - api(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + api(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.io.ktor.ktor.client.logging.jvm1780199912.get().let { "${it.group}:ktor-client-logging:${it.version}" }) { diff --git a/fleet/build/platform/gradlebuild/build.gradle.kts b/fleet/build/platform/gradlebuild/build.gradle.kts index a7b14599d9bd..1d6f8603795a 100644 --- a/fleet/build/platform/gradlebuild/build.gradle.kts +++ b/fleet/build/platform/gradlebuild/build.gradle.kts @@ -55,7 +55,7 @@ kotlin { implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.json.jvm231489733.get().let { "${it.group}:kotlinx-serialization-json:${it.version}" }) { isTransitive = false } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } } diff --git a/fleet/build/s3/gradlebuild/build.gradle.kts b/fleet/build/s3/gradlebuild/build.gradle.kts index 063f1a296e6c..32451f918bc4 100644 --- a/fleet/build/s3/gradlebuild/build.gradle.kts +++ b/fleet/build/s3/gradlebuild/build.gradle.kts @@ -47,7 +47,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.aws.sdk.kotlin.s3.jvm321782429.get().let { "${it.group}:s3:${it.version}" }) { diff --git a/fleet/bundles/gradlebuild/build.gradle.kts b/fleet/bundles/gradlebuild/build.gradle.kts index 75698d939bcf..78b65c629d11 100644 --- a/fleet/bundles/gradlebuild/build.gradle.kts +++ b/fleet/bundles/gradlebuild/build.gradle.kts @@ -62,7 +62,7 @@ kotlin { implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.json.jvm231489733.get().let { "${it.group}:kotlinx-serialization-json:${it.version}" }) { isTransitive = false } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(project(":fleet.util.core")) diff --git a/fleet/codecache/gradlebuild/build.gradle.kts b/fleet/codecache/gradlebuild/build.gradle.kts index 5f9bcb142c9d..31e8e1c60399 100644 --- a/fleet/codecache/gradlebuild/build.gradle.kts +++ b/fleet/codecache/gradlebuild/build.gradle.kts @@ -53,7 +53,7 @@ kotlin { sourceSets.wasmJsTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsTest")) } sourceSets.wasmJsTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsTest")) } sourceSets.commonMain.dependencies { - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { diff --git a/fleet/codecache/test/gradlebuild/build.gradle.kts b/fleet/codecache/test/gradlebuild/build.gradle.kts index e76d130393e0..c11db5d976c3 100644 --- a/fleet/codecache/test/gradlebuild/build.gradle.kts +++ b/fleet/codecache/test/gradlebuild/build.gradle.kts @@ -49,7 +49,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlin.kotlin.test542871666.get().let { "${it.group}:${it.name}:${it.version}" }) { diff --git a/fleet/kernel/gradlebuild/build.gradle.kts b/fleet/kernel/gradlebuild/build.gradle.kts index 84af86801bf6..5acfb70cf893 100644 --- a/fleet/kernel/gradlebuild/build.gradle.kts +++ b/fleet/kernel/gradlebuild/build.gradle.kts @@ -65,7 +65,7 @@ kotlin { implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.json.jvm231489733.get().let { "${it.group}:kotlinx-serialization-json:${it.version}" }) { isTransitive = false } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.intellij.deps.fastutil.intellij.deps.fastutil1191883795.get().let { "${it.group}:${it.name}:${it.version}" }) { diff --git a/fleet/ktor/client/cio/gradlebuild/build.gradle.kts b/fleet/ktor/client/cio/gradlebuild/build.gradle.kts index 78276bf8c0b8..df69e49215b0 100644 --- a/fleet/ktor/client/cio/gradlebuild/build.gradle.kts +++ b/fleet/ktor/client/cio/gradlebuild/build.gradle.kts @@ -75,7 +75,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.io.core.jvm479158162.get().let { "${it.group}:kotlinx-io-core:${it.version}" }) { @@ -99,7 +99,7 @@ kotlin { api(jps.io.ktor.ktor.network.tls.jvm656433577.get().let { "${it.group}:${it.name}:${it.version}" }) { isTransitive = false } - implementation(jps.com.intellij.platform.kotlinx.coroutines.slf4j1899700727.get().let { "${it.group}:${it.name}:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.slf4j1547890256.get().let { "${it.group}:${it.name}:${it.version}" }) { isTransitive = false } } diff --git a/fleet/ktor/client/core/gradlebuild/build.gradle.kts b/fleet/ktor/client/core/gradlebuild/build.gradle.kts index b3e780eb06b5..0ad6d01222f4 100644 --- a/fleet/ktor/client/core/gradlebuild/build.gradle.kts +++ b/fleet/ktor/client/core/gradlebuild/build.gradle.kts @@ -77,7 +77,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.io.core.jvm479158162.get().let { "${it.group}:kotlinx-io-core:${it.version}" }) { @@ -95,7 +95,7 @@ kotlin { api(jps.io.ktor.ktor.network.jvm1442946683.get().let { "${it.group}:${it.name}:${it.version}" }) { isTransitive = false } - implementation(jps.com.intellij.platform.kotlinx.coroutines.slf4j1899700727.get().let { "${it.group}:${it.name}:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.slf4j1547890256.get().let { "${it.group}:${it.name}:${it.version}" }) { isTransitive = false } } diff --git a/fleet/ktor/network/tls/gradlebuild/build.gradle.kts b/fleet/ktor/network/tls/gradlebuild/build.gradle.kts index 9adb5e3e7fb4..cc844516abba 100644 --- a/fleet/ktor/network/tls/gradlebuild/build.gradle.kts +++ b/fleet/ktor/network/tls/gradlebuild/build.gradle.kts @@ -54,7 +54,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.io.core.jvm479158162.get().let { "${it.group}:kotlinx-io-core:${it.version}" }) { diff --git a/fleet/ktor/server/cio/gradlebuild/build.gradle.kts b/fleet/ktor/server/cio/gradlebuild/build.gradle.kts index 18ebfac84442..47dd25e08efb 100644 --- a/fleet/ktor/server/cio/gradlebuild/build.gradle.kts +++ b/fleet/ktor/server/cio/gradlebuild/build.gradle.kts @@ -76,7 +76,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.io.core.jvm479158162.get().let { "${it.group}:kotlinx-io-core:${it.version}" }) { diff --git a/fleet/lsp.protocol/gradlebuild/build.gradle.kts b/fleet/lsp.protocol/gradlebuild/build.gradle.kts index c897deba87dc..828a97e04d46 100644 --- a/fleet/lsp.protocol/gradlebuild/build.gradle.kts +++ b/fleet/lsp.protocol/gradlebuild/build.gradle.kts @@ -56,7 +56,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.core.jvm1739247612.get().let { "${it.group}:kotlinx-serialization-core:${it.version}" }) { diff --git a/fleet/multiplatform.shims/gradlebuild/build.gradle.kts b/fleet/multiplatform.shims/gradlebuild/build.gradle.kts index 7da66feeb8a0..95612b21cc93 100644 --- a/fleet/multiplatform.shims/gradlebuild/build.gradle.kts +++ b/fleet/multiplatform.shims/gradlebuild/build.gradle.kts @@ -55,7 +55,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } } diff --git a/fleet/reporting/api/gradlebuild/build.gradle.kts b/fleet/reporting/api/gradlebuild/build.gradle.kts index 181c035abcd4..62b1f49ca33c 100644 --- a/fleet/reporting/api/gradlebuild/build.gradle.kts +++ b/fleet/reporting/api/gradlebuild/build.gradle.kts @@ -52,7 +52,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } } diff --git a/fleet/reporting/shared/gradlebuild/build.gradle.kts b/fleet/reporting/shared/gradlebuild/build.gradle.kts index b10118ac787f..96094ba67a2b 100644 --- a/fleet/reporting/shared/gradlebuild/build.gradle.kts +++ b/fleet/reporting/shared/gradlebuild/build.gradle.kts @@ -54,7 +54,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.core.jvm1739247612.get().let { "${it.group}:kotlinx-serialization-core:${it.version}" }) { diff --git a/fleet/rpc.server/gradlebuild/build.gradle.kts b/fleet/rpc.server/gradlebuild/build.gradle.kts index 7f53ed414394..24a6e43c8d3a 100644 --- a/fleet/rpc.server/gradlebuild/build.gradle.kts +++ b/fleet/rpc.server/gradlebuild/build.gradle.kts @@ -51,7 +51,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.core.jvm1739247612.get().let { "${it.group}:kotlinx-serialization-core:${it.version}" }) { diff --git a/fleet/rpc/gradlebuild/build.gradle.kts b/fleet/rpc/gradlebuild/build.gradle.kts index 965e16f9eed9..cd07bf9d0d59 100644 --- a/fleet/rpc/gradlebuild/build.gradle.kts +++ b/fleet/rpc/gradlebuild/build.gradle.kts @@ -62,7 +62,7 @@ kotlin { exclude(group = "org.jetbrains", module = "annotations") } implementation(jps.org.jetbrains.annotations1504825916.get()) - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.datetime.jvm1686009755.get().let { "${it.group}:kotlinx-datetime:${it.version}" }) { diff --git a/fleet/util/core/gradlebuild/build.gradle.kts b/fleet/util/core/gradlebuild/build.gradle.kts index 5a600fdd637e..9b004c9f1369 100644 --- a/fleet/util/core/gradlebuild/build.gradle.kts +++ b/fleet/util/core/gradlebuild/build.gradle.kts @@ -58,7 +58,7 @@ kotlin { implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.core.jvm1739247612.get().let { "${it.group}:kotlinx-serialization-core:${it.version}" }) { diff --git a/fleet/util/logging/api/gradlebuild/build.gradle.kts b/fleet/util/logging/api/gradlebuild/build.gradle.kts index da9de6349745..34db1cbf8f43 100644 --- a/fleet/util/logging/api/gradlebuild/build.gradle.kts +++ b/fleet/util/logging/api/gradlebuild/build.gradle.kts @@ -57,7 +57,7 @@ kotlin { api(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - api(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + api(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } } diff --git a/fleet/util/network/gradlebuild/build.gradle.kts b/fleet/util/network/gradlebuild/build.gradle.kts index ccf2ac79afde..0ca1d7e64a3b 100644 --- a/fleet/util/network/gradlebuild/build.gradle.kts +++ b/fleet/util/network/gradlebuild/build.gradle.kts @@ -53,7 +53,7 @@ kotlin { api(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { exclude(group = "org.jetbrains", module = "annotations") } - api(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + api(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.core.jvm930800474.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { isTransitive = false } implementation(jps.org.bouncycastle.bcpkix.jdk18on845177467.get()) diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 03ed3aa06c30..8a0fea97925b 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -4678,8 +4678,8 @@ jvm_import( jvm_import( name = "kotlinx-coroutines-core", - jar = "@com_intellij_platform-kotlinx-coroutines-core-jvm-1_10_1-intellij-5_http//file", - source_jar = "@com_intellij_platform-kotlinx-coroutines-core-jvm-1_10_1-intellij-5_http//file", + jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-core-jvm-1_10_1-intellij-6_http//file", + source_jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-core-jvm-1_10_1-intellij-6_http//file", visibility = ["//visibility:public"] ) @@ -4692,29 +4692,29 @@ java_library( jvm_import( name = "kotlinx-coroutines-debug", - jar = "@com_intellij_platform-kotlinx-coroutines-debug-1_10_1-intellij-5_http//file", - source_jar = "@com_intellij_platform-kotlinx-coroutines-debug-1_10_1-intellij-5_http//file", + jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-debug-1_10_1-intellij-6_http//file", + source_jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-debug-1_10_1-intellij-6_http//file", visibility = ["//visibility:public"] ) jvm_import( name = "kotlinx-coroutines-guava", - jar = "@com_intellij_platform-kotlinx-coroutines-guava-1_10_1-intellij-5_http//file", - source_jar = "@com_intellij_platform-kotlinx-coroutines-guava-1_10_1-intellij-5_http//file", + jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-guava-1_10_1-intellij-6_http//file", + source_jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-guava-1_10_1-intellij-6_http//file", visibility = ["//visibility:public"] ) jvm_import( name = "kotlinx-coroutines-slf4j", - jar = "@com_intellij_platform-kotlinx-coroutines-slf4j-1_10_1-intellij-5_http//file", - source_jar = "@com_intellij_platform-kotlinx-coroutines-slf4j-1_10_1-intellij-5_http//file", + jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-slf4j-1_10_1-intellij-6_http//file", + source_jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-slf4j-1_10_1-intellij-6_http//file", visibility = ["//visibility:public"] ) jvm_import( name = "kotlinx-coroutines-test", - jar = "@com_intellij_platform-kotlinx-coroutines-test-jvm-1_10_1-intellij-5_http//file", - source_jar = "@com_intellij_platform-kotlinx-coroutines-test-jvm-1_10_1-intellij-5_http//file", + jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-test-jvm-1_10_1-intellij-6_http//file", + source_jar = "@org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-test-jvm-1_10_1-intellij-6_http//file", visibility = ["//visibility:public"] ) diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 13ed32cd963f..4061202f88cf 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -6958,73 +6958,73 @@ http_file( ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-core-jvm-1_10_1-intellij-5_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-core-jvm/1.10.1-intellij-5/kotlinx-coroutines-core-jvm-1.10.1-intellij-5.jar", - sha256 = "e9b7e2b1262fd02fe63b08f636903ff36f453f08ae52190c78e3cbf19d777e42", - downloaded_file_path = "kotlinx-coroutines-core-jvm-1.10.1-intellij-5.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-core-jvm-1_10_1-intellij-6_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-core-jvm/1.10.1-intellij-6/kotlinx-coroutines-core-jvm-1.10.1-intellij-6.jar", + sha256 = "f0c5dd90a0d1b5555a39a3151ef943bba54521d0b77caa06282c4584dbf94a68", + downloaded_file_path = "kotlinx-coroutines-core-jvm-1.10.1-intellij-6.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-core-jvm-1_10_1-intellij-5-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-core-jvm/1.10.1-intellij-5/kotlinx-coroutines-core-jvm-1.10.1-intellij-5-sources.jar", + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-core-jvm-1_10_1-intellij-6-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-core-jvm/1.10.1-intellij-6/kotlinx-coroutines-core-jvm-1.10.1-intellij-6-sources.jar", sha256 = "c3eb90d9d641807f87f1b3e4780c25b408a2a18285f03737cc1b6909142ee339", - downloaded_file_path = "kotlinx-coroutines-core-jvm-1.10.1-intellij-5-sources.jar" + downloaded_file_path = "kotlinx-coroutines-core-jvm-1.10.1-intellij-6-sources.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-debug-1_10_1-intellij-5_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-debug/1.10.1-intellij-5/kotlinx-coroutines-debug-1.10.1-intellij-5.jar", - sha256 = "f8f56f19d2b29da511809c3345d2f0bf283bfb94a0a0d83f5b630e1424625723", - downloaded_file_path = "kotlinx-coroutines-debug-1.10.1-intellij-5.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-debug-1_10_1-intellij-6_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-debug/1.10.1-intellij-6/kotlinx-coroutines-debug-1.10.1-intellij-6.jar", + sha256 = "2c758b1d2fc710ce7bb9d83b66e10322cea522a10a7883babeb5469930d884c5", + downloaded_file_path = "kotlinx-coroutines-debug-1.10.1-intellij-6.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-debug-1_10_1-intellij-5-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-debug/1.10.1-intellij-5/kotlinx-coroutines-debug-1.10.1-intellij-5-sources.jar", - sha256 = "15953fe4bba26269962e90e1c61a676c8f4424e3a685060e14c7e3d46e3e3c49", - downloaded_file_path = "kotlinx-coroutines-debug-1.10.1-intellij-5-sources.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-debug-1_10_1-intellij-6-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-debug/1.10.1-intellij-6/kotlinx-coroutines-debug-1.10.1-intellij-6-sources.jar", + sha256 = "c1c3c00eba34a9c16411e9960053c7a9dff5e95befa40a2dbbe9647750f03980", + downloaded_file_path = "kotlinx-coroutines-debug-1.10.1-intellij-6-sources.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-guava-1_10_1-intellij-5_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-guava/1.10.1-intellij-5/kotlinx-coroutines-guava-1.10.1-intellij-5.jar", - sha256 = "61ff422fe859c2439d94727eb6dcd7ccadb5ba0d9cce4e181db1946209ef9bf6", - downloaded_file_path = "kotlinx-coroutines-guava-1.10.1-intellij-5.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-guava-1_10_1-intellij-6_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-guava/1.10.1-intellij-6/kotlinx-coroutines-guava-1.10.1-intellij-6.jar", + sha256 = "19aee8eb1611f2b3a2fc53a98288537b24892c1e2d1ab666bf87ebc0680036a0", + downloaded_file_path = "kotlinx-coroutines-guava-1.10.1-intellij-6.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-guava-1_10_1-intellij-5-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-guava/1.10.1-intellij-5/kotlinx-coroutines-guava-1.10.1-intellij-5-sources.jar", - sha256 = "b7c361cf0ce982d8c0477a3d4dfbd72d7b1f798641512042bab09128395a326e", - downloaded_file_path = "kotlinx-coroutines-guava-1.10.1-intellij-5-sources.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-guava-1_10_1-intellij-6-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-guava/1.10.1-intellij-6/kotlinx-coroutines-guava-1.10.1-intellij-6-sources.jar", + sha256 = "fd63e2ee6d726b0c8886a223beba3d8504f9c846688c91104b4c5cd5cb89a4b1", + downloaded_file_path = "kotlinx-coroutines-guava-1.10.1-intellij-6-sources.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-slf4j-1_10_1-intellij-5_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-slf4j/1.10.1-intellij-5/kotlinx-coroutines-slf4j-1.10.1-intellij-5.jar", - sha256 = "1d68dfc6ba67ec96ecb5a373dbd9fb557ce2210ffc2d74d6b528e4f1f73e7003", - downloaded_file_path = "kotlinx-coroutines-slf4j-1.10.1-intellij-5.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-slf4j-1_10_1-intellij-6_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-slf4j/1.10.1-intellij-6/kotlinx-coroutines-slf4j-1.10.1-intellij-6.jar", + sha256 = "5da8f9755dd622e7b2cf06e545cc33d2453a4fb44e5e31a8a957b97eaf44f386", + downloaded_file_path = "kotlinx-coroutines-slf4j-1.10.1-intellij-6.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-slf4j-1_10_1-intellij-5-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-slf4j/1.10.1-intellij-5/kotlinx-coroutines-slf4j-1.10.1-intellij-5-sources.jar", - sha256 = "a18103eae7fb7fc765b71726c25363a0e9a501aaaba26258b2dddce5817561f0", - downloaded_file_path = "kotlinx-coroutines-slf4j-1.10.1-intellij-5-sources.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-slf4j-1_10_1-intellij-6-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-slf4j/1.10.1-intellij-6/kotlinx-coroutines-slf4j-1.10.1-intellij-6-sources.jar", + sha256 = "b78a1d3ee68bbcbe586af07ddf115acfcaa5140b151b096cb46ed0ab03e2e873", + downloaded_file_path = "kotlinx-coroutines-slf4j-1.10.1-intellij-6-sources.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-test-jvm-1_10_1-intellij-5_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-test-jvm/1.10.1-intellij-5/kotlinx-coroutines-test-jvm-1.10.1-intellij-5.jar", - sha256 = "98b5c1291d9e473ce6df9823781a8a2170f1dfb4c30d985c56ff5242df2ff8f5", - downloaded_file_path = "kotlinx-coroutines-test-jvm-1.10.1-intellij-5.jar" + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-test-jvm-1_10_1-intellij-6_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-test-jvm/1.10.1-intellij-6/kotlinx-coroutines-test-jvm-1.10.1-intellij-6.jar", + sha256 = "9f9ade080368414b52d7e66b2cc48f65a2e369f98b2de2d56a6664428dd58131", + downloaded_file_path = "kotlinx-coroutines-test-jvm-1.10.1-intellij-6.jar" ) http_file( - name = "com_intellij_platform-kotlinx-coroutines-test-jvm-1_10_1-intellij-5-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/intellij/platform/kotlinx-coroutines-test-jvm/1.10.1-intellij-5/kotlinx-coroutines-test-jvm-1.10.1-intellij-5-sources.jar", + name = "org_jetbrains_intellij_deps_kotlinx-kotlinx-coroutines-test-jvm-1_10_1-intellij-6-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-test-jvm/1.10.1-intellij-6/kotlinx-coroutines-test-jvm-1.10.1-intellij-6-sources.jar", sha256 = "89847b3d36bcbb75f3f4dedc674937dae5f0d5c59f9e6fef0313cbe15a8f3617", - downloaded_file_path = "kotlinx-coroutines-test-jvm-1.10.1-intellij-5-sources.jar" + downloaded_file_path = "kotlinx-coroutines-test-jvm-1.10.1-intellij-6-sources.jar" ) http_file( diff --git a/libraries/kotlinx/coroutines/slf4j/module-content.yaml b/libraries/kotlinx/coroutines/slf4j/module-content.yaml index 97d88b3fad2c..df3657962a91 100644 --- a/libraries/kotlinx/coroutines/slf4j/module-content.yaml +++ b/libraries/kotlinx/coroutines/slf4j/module-content.yaml @@ -3,4 +3,4 @@ - name: intellij.libraries.kotlinx.coroutines.slf4j library: kotlinx-coroutines-slf4j files: - - name: $MAVEN_REPOSITORY$/com/intellij/platform/kotlinx-coroutines-slf4j/1/kotlinx-coroutines-slf4j-1.jar \ No newline at end of file + - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-slf4j/1/kotlinx-coroutines-slf4j-1.jar \ No newline at end of file diff --git a/platform/vcs-log/impl/module-content.yaml b/platform/vcs-log/impl/module-content.yaml index 487bf066ddf1..25518513ff8e 100644 --- a/platform/vcs-log/impl/module-content.yaml +++ b/platform/vcs-log/impl/module-content.yaml @@ -3,4 +3,4 @@ - name: intellij.platform.vcs.log.impl library: kotlinx-coroutines-guava files: - - name: $MAVEN_REPOSITORY$/com/intellij/platform/kotlinx-coroutines-guava/1/kotlinx-coroutines-guava-1.jar \ No newline at end of file + - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/kotlinx/kotlinx-coroutines-guava/1/kotlinx-coroutines-guava-1.jar \ No newline at end of file