From 6c6717da5a1da54ec1f4ed0f0c22bf7f00921999 Mon Sep 17 00:00:00 2001 From: mvicsokolova Date: Thu, 30 Jun 2022 13:56:22 +0200 Subject: [PATCH] Revert renaming the kotlinx-atomicfu-runtime module --- plugins/atomicfu/atomicfu-compiler/build.gradle.kts | 4 ++-- settings.gradle | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts index 4e12edb5ffe..717f53bc887 100644 --- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts +++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts @@ -76,9 +76,9 @@ dependencies { atomicfuJsClasspath("org.jetbrains.kotlinx:atomicfu-js:0.17.1") { isTransitive = false } atomicfuJvmClasspath("org.jetbrains.kotlinx:atomicfu:0.17.1") { isTransitive = false } - atomicfuJsIrRuntimeForTests(project(":atomicfu-runtime")) { isTransitive = false } + atomicfuJsIrRuntimeForTests(project(":kotlinx-atomicfu-runtime")) { isTransitive = false } - embedded(project(":atomicfu-runtime")) { + embedded(project(":kotlinx-atomicfu-runtime")) { attributes { attribute(KotlinPlatformType.attribute, KotlinPlatformType.js) attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir) diff --git a/settings.gradle b/settings.gradle index 124cd8e16a2..bd2d37cb7dd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -808,7 +808,6 @@ project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/ project(':kotlinx-atomicfu-compiler-plugin').projectDir = file("$rootDir/plugins/atomicfu/atomicfu-compiler") project(':kotlinx-atomicfu-runtime').projectDir = file("$rootDir/plugins/atomicfu/atomicfu-runtime") -project(':kotlinx-atomicfu-runtime').name = 'atomicfu-runtime' project(':atomicfu').projectDir = file("$rootDir/libraries/tools/atomicfu") project(':kotlin-scripting-ide-services-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-ide-services" as File