diff --git a/build-logic/README.md b/build-logic/README.md
new file mode 100644
index 0000000000..e8d18cbd97
--- /dev/null
+++ b/build-logic/README.md
@@ -0,0 +1,7 @@
+# About build-logic Module
+
+This module aims to share common build logic for whole projects, previously we were using [buildSrc](https://docs.gradle.org/7.6/userguide/organizing_gradle_projects.html#sec:build_sources),
+but for some reasons like "A change in buildSrc causes the whole project to become out-of-date", we are migrating to [composite builds](https://docs.gradle.org/7.6/userguide/composite_builds.html),
+which avoids the side effects of buildSrc.
+
+For more information, you can ref https://proandroiddev.com/stop-using-gradle-buildsrc-use-composite-builds-instead-3c38ac7a2ab3.
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/build-logic/build.gradle.kts
similarity index 94%
rename from buildSrc/build.gradle.kts
rename to build-logic/build.gradle.kts
index 00733d6456..0c054c5cdf 100644
--- a/buildSrc/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -28,5 +28,4 @@ dependencies {
     implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.12.1")
     implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
-    implementation("com.gradle.publish:plugin-publish-plugin:0.20.0")
 }
diff --git a/buildSrc/settings.gradle.kts b/build-logic/settings.gradle.kts
similarity index 88%
rename from buildSrc/settings.gradle.kts
rename to build-logic/settings.gradle.kts
index 2144de34f9..55dfe5c1a3 100644
--- a/buildSrc/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -1,4 +1,4 @@
-rootProject.name = "buildSrc"
+rootProject.name = "build-logic"
 
 pluginManagement {
     repositories {
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/CrossPlatformExec.kt b/build-logic/src/main/kotlin/org/jetbrains/CrossPlatformExec.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/CrossPlatformExec.kt
rename to build-logic/src/main/kotlin/org/jetbrains/CrossPlatformExec.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt b/build-logic/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt
rename to build-logic/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt b/build-logic/src/main/kotlin/org/jetbrains/DokkaVersion.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt
rename to build-logic/src/main/kotlin/org/jetbrains/DokkaVersion.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersionType.kt b/build-logic/src/main/kotlin/org/jetbrains/DokkaVersionType.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/DokkaVersionType.kt
rename to build-logic/src/main/kotlin/org/jetbrains/DokkaVersionType.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt b/build-logic/src/main/kotlin/org/jetbrains/SetupMaven.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt
rename to build-logic/src/main/kotlin/org/jetbrains/SetupMaven.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/ValidatePublications.kt b/build-logic/src/main/kotlin/org/jetbrains/ValidatePublications.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/ValidatePublications.kt
rename to build-logic/src/main/kotlin/org/jetbrains/ValidatePublications.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
similarity index 97%
rename from buildSrc/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
rename to build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
index 3addac741a..2073f9a207 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
@@ -8,7 +8,7 @@ package org.jetbrains.conventions
  */
 
 plugins {
-    `java`
+    java
 }
 
 java {
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/conventions/base.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/base.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/conventions/base.gradle.kts
rename to build-logic/src/main/kotlin/org/jetbrains/conventions/base.gradle.kts
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/conventions/dokka-integration-test.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/dokka-integration-test.gradle.kts
similarity index 91%
rename from buildSrc/src/main/kotlin/org/jetbrains/conventions/dokka-integration-test.gradle.kts
rename to build-logic/src/main/kotlin/org/jetbrains/conventions/dokka-integration-test.gradle.kts
index 612502cd29..f9edb68e8e 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/conventions/dokka-integration-test.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/dokka-integration-test.gradle.kts
@@ -7,16 +7,16 @@ plugins {
     id("org.jetbrains.conventions.kotlin-jvm")
 }
 
-val integrationTestSourceSet = sourceSets.create("integrationTest") {
+val integrationTestSourceSet: SourceSet = sourceSets.create("integrationTest") {
     compileClasspath += sourceSets.main.get().output
     runtimeClasspath += sourceSets.main.get().output
 }
 
-val integrationTestImplementation by configurations.getting {
+val integrationTestImplementation: Configuration by configurations.getting {
     extendsFrom(configurations.implementation.get())
 }
 
-val integrationTestRuntimeOnly by configurations.getting {
+val integrationTestRuntimeOnly: Configuration by configurations.getting {
     extendsFrom(configurations.runtimeOnly.get())
 }
 
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/conventions/dokka.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/dokka.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/conventions/dokka.gradle.kts
rename to build-logic/src/main/kotlin/org/jetbrains/conventions/dokka.gradle.kts
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
rename to build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/conventions/maven-publish.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/maven-publish.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/conventions/maven-publish.gradle.kts
rename to build-logic/src/main/kotlin/org/jetbrains/conventions/maven-publish.gradle.kts
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/projectUtils.kt b/build-logic/src/main/kotlin/org/jetbrains/projectUtils.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/projectUtils.kt
rename to build-logic/src/main/kotlin/org/jetbrains/projectUtils.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/publication.kt b/build-logic/src/main/kotlin/org/jetbrains/publication.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/publication.kt
rename to build-logic/src/main/kotlin/org/jetbrains/publication.kt
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt b/build-logic/src/main/kotlin/org/jetbrains/taskUtils.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt
rename to build-logic/src/main/kotlin/org/jetbrains/taskUtils.kt
diff --git a/build.gradle.kts b/build.gradle.kts
index 08373920a9..76067b7531 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,11 +2,11 @@ import org.jetbrains.ValidatePublications
 import org.jetbrains.publicationChannels
 
 plugins {
-    org.jetbrains.conventions.base
-    id("org.jetbrains.dokka")
-    id("io.github.gradle-nexus.publish-plugin")
-
-    id("org.jetbrains.kotlinx.binary-compatibility-validator")
+    id("org.jetbrains.conventions.base") apply false
+    id("org.jetbrains.dokka") version "1.8.10"
+    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    id("com.gradle.plugin-publish") version "0.20.0"
+    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.12.1"
 }
 
 val dokka_version: String by project
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 1d7c1f1747..a59bb0a585 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.dokkaVersion
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/core/content-matcher-test-utils/build.gradle.kts b/core/content-matcher-test-utils/build.gradle.kts
index 1a95f1cdcc..4ddba0fba7 100644
--- a/core/content-matcher-test-utils/build.gradle.kts
+++ b/core/content-matcher-test-utils/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
+    id("org.jetbrains.conventions.kotlin-jvm")
 }
 
 dependencies {
diff --git a/core/test-api/build.gradle.kts b/core/test-api/build.gradle.kts
index b3f570100a..b913700914 100644
--- a/core/test-api/build.gradle.kts
+++ b/core/test-api/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts
index 80c07b374a..fd1d7746fc 100644
--- a/integration-tests/build.gradle.kts
+++ b/integration-tests/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
+    id("org.jetbrains.conventions.kotlin-jvm")
 }
 
 dependencies {
diff --git a/integration-tests/cli/build.gradle.kts b/integration-tests/cli/build.gradle.kts
index 71d36a9b03..c0cb46ee04 100644
--- a/integration-tests/cli/build.gradle.kts
+++ b/integration-tests/cli/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    org.jetbrains.conventions.`dokka-integration-test`
+    id("org.jetbrains.conventions.dokka-integration-test")
     id("com.github.johnrengelman.shadow")
 }
 
diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index 3f3be54b9e..f47ef6709e 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.dependsOnMavenLocalPublication
 
 plugins {
-    org.jetbrains.conventions.`dokka-integration-test`
+    id("org.jetbrains.conventions.dokka-integration-test")
 }
 
 dependencies {
diff --git a/integration-tests/maven/build.gradle.kts b/integration-tests/maven/build.gradle.kts
index 0a2cb7c468..4b8b60113b 100644
--- a/integration-tests/maven/build.gradle.kts
+++ b/integration-tests/maven/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.SetupMaven
 import org.jetbrains.dependsOnMavenLocalPublication
 
 plugins {
-    org.jetbrains.conventions.`dokka-integration-test`
+    id("org.jetbrains.conventions.dokka-integration-test")
 }
 
 evaluationDependsOn(":runners:maven-plugin")
diff --git a/kotlin-analysis/build.gradle.kts b/kotlin-analysis/build.gradle.kts
index e2cb50e049..36dc58c4ed 100644
--- a/kotlin-analysis/build.gradle.kts
+++ b/kotlin-analysis/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
     id("com.github.johnrengelman.shadow")
 }
 
diff --git a/kotlin-analysis/compiler-dependency/build.gradle.kts b/kotlin-analysis/compiler-dependency/build.gradle.kts
index bbea28dd43..f18b6f493b 100644
--- a/kotlin-analysis/compiler-dependency/build.gradle.kts
+++ b/kotlin-analysis/compiler-dependency/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
     id("com.github.johnrengelman.shadow")
 }
 
diff --git a/kotlin-analysis/intellij-dependency/build.gradle.kts b/kotlin-analysis/intellij-dependency/build.gradle.kts
index 732b9d80e5..ad9d74e851 100644
--- a/kotlin-analysis/intellij-dependency/build.gradle.kts
+++ b/kotlin-analysis/intellij-dependency/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
     id("com.github.johnrengelman.shadow")
 }
 
diff --git a/plugins/all-modules-page/build.gradle.kts b/plugins/all-modules-page/build.gradle.kts
index cd07d9b370..ef91b9ee65 100644
--- a/plugins/all-modules-page/build.gradle.kts
+++ b/plugins/all-modules-page/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 registerDokkaArtifactPublication("dokkaAllModulesPage") {
diff --git a/plugins/android-documentation/build.gradle.kts b/plugins/android-documentation/build.gradle.kts
index e129352038..e0766ab480 100644
--- a/plugins/android-documentation/build.gradle.kts
+++ b/plugins/android-documentation/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/base/base-test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts
index b7d021159d..36ff2011ca 100644
--- a/plugins/base/base-test-utils/build.gradle.kts
+++ b/plugins/base/base-test-utils/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index 089e26d1b1..2bbfaa8c46 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index bb97cdd3c6..8892362b95 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/gfm/gfm-template-processing/build.gradle.kts b/plugins/gfm/gfm-template-processing/build.gradle.kts
index 450b33a2e3..41790b441b 100644
--- a/plugins/gfm/gfm-template-processing/build.gradle.kts
+++ b/plugins/gfm/gfm-template-processing/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts
index c41256cad8..f29207308d 100644
--- a/plugins/javadoc/build.gradle.kts
+++ b/plugins/javadoc/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 483c58b3dd..1291c56d46 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/jekyll/jekyll-template-processing/build.gradle.kts b/plugins/jekyll/jekyll-template-processing/build.gradle.kts
index 9845a993dd..6cfb48f246 100644
--- a/plugins/jekyll/jekyll-template-processing/build.gradle.kts
+++ b/plugins/jekyll/jekyll-template-processing/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index 1b759efbd6..979896973f 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index 07ac053be4..4219a66bbe 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 dependencies {
diff --git a/plugins/templating/build.gradle.kts b/plugins/templating/build.gradle.kts
index d4909d9bf3..c4d919931f 100644
--- a/plugins/templating/build.gradle.kts
+++ b/plugins/templating/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 registerDokkaArtifactPublication("templating-plugin") {
diff --git a/plugins/versioning/build.gradle.kts b/plugins/versioning/build.gradle.kts
index 0c7ee0a454..eafd094fa0 100644
--- a/plugins/versioning/build.gradle.kts
+++ b/plugins/versioning/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 registerDokkaArtifactPublication("versioning-plugin") {
diff --git a/runners/cli/build.gradle.kts b/runners/cli/build.gradle.kts
index b522dbddd3..5461837ef6 100644
--- a/runners/cli/build.gradle.kts
+++ b/runners/cli/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
     id("com.github.johnrengelman.shadow")
 }
 
diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index 0b6908d499..5ce70dcc17 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.*
 
 plugins {
     `kotlin-dsl`
-    org.jetbrains.conventions.`maven-publish`
-    org.jetbrains.conventions.`base-java`
+    id("org.jetbrains.conventions.maven-publish")
+    id("org.jetbrains.conventions.base-java")
     id("com.gradle.plugin-publish")
 }
 
diff --git a/runners/maven-plugin/build.gradle.kts b/runners/maven-plugin/build.gradle.kts
index 6cd0395ee3..f8badf8e49 100644
--- a/runners/maven-plugin/build.gradle.kts
+++ b/runners/maven-plugin/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.SetupMaven
 import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
-    org.jetbrains.conventions.`maven-publish`
+    id("org.jetbrains.conventions.kotlin-jvm")
+    id("org.jetbrains.conventions.maven-publish")
 }
 
 val setupMaven by tasks.register<SetupMaven>("setupMaven")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 91023501ae..9794dd1889 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -39,6 +39,7 @@ include(
 
     ":mkdocs",
 )
+includeBuild("build-logic")
 
 val isCiBuild = System.getenv("GITHUB_ACTIONS") != null || System.getenv("TEAMCITY_VERSION") != null
 
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index c80472fd9a..6bd501b7aa 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.jetbrains.conventions.`kotlin-jvm`
+    id("org.jetbrains.conventions.kotlin-jvm")
 }
 
 dependencies {