IncludeBuild build-logic

Kotlin · Mar 11, 2023 · 861b0f0 · 861b0f0
1 parent 6fcd66a
commit 861b0f0
Show file tree

Hide file tree

Showing 46 changed files with 52 additions and 50 deletions.
diff --git a/buildSrc/build.gradle.kts → build-logic/build.gradle.kts b/buildSrc/build.gradle.kts → build-logic/build.gradle.kts
diff --git a/buildSrc/settings.gradle.kts → build-logic/settings.gradle.kts b/buildSrc/settings.gradle.kts → build-logic/settings.gradle.kts
@@ -1,4 +1,4 @@
-rootProject.name = "buildSrc"
+rootProject.name = "build-logic"
 
 pluginManagement {
     repositories {

diff --git a/...kotlin/org/jetbrains/CrossPlatformExec.kt → ...kotlin/org/jetbrains/CrossPlatformExec.kt b/...kotlin/org/jetbrains/CrossPlatformExec.kt → ...kotlin/org/jetbrains/CrossPlatformExec.kt
diff --git a/.../org/jetbrains/DokkaPublicationChannel.kt → .../org/jetbrains/DokkaPublicationChannel.kt b/.../org/jetbrains/DokkaPublicationChannel.kt → .../org/jetbrains/DokkaPublicationChannel.kt
diff --git a/...main/kotlin/org/jetbrains/DokkaVersion.kt → ...main/kotlin/org/jetbrains/DokkaVersion.kt b/...main/kotlin/org/jetbrains/DokkaVersion.kt → ...main/kotlin/org/jetbrains/DokkaVersion.kt
diff --git a/.../kotlin/org/jetbrains/DokkaVersionType.kt → .../kotlin/org/jetbrains/DokkaVersionType.kt b/.../kotlin/org/jetbrains/DokkaVersionType.kt → .../kotlin/org/jetbrains/DokkaVersionType.kt
diff --git a/...c/main/kotlin/org/jetbrains/SetupMaven.kt → ...c/main/kotlin/org/jetbrains/SetupMaven.kt b/...c/main/kotlin/org/jetbrains/SetupMaven.kt → ...c/main/kotlin/org/jetbrains/SetupMaven.kt
diff --git a/...lin/org/jetbrains/ValidatePublications.kt → ...lin/org/jetbrains/ValidatePublications.kt b/...lin/org/jetbrains/ValidatePublications.kt → ...lin/org/jetbrains/ValidatePublications.kt
diff --git a/...etbrains/conventions/base-java.gradle.kts → ...etbrains/conventions/base-java.gradle.kts b/...etbrains/conventions/base-java.gradle.kts → ...etbrains/conventions/base-java.gradle.kts
diff --git a/...org/jetbrains/conventions/base.gradle.kts → ...org/jetbrains/conventions/base.gradle.kts b/...org/jetbrains/conventions/base.gradle.kts → ...org/jetbrains/conventions/base.gradle.kts
diff --git a/...entions/dokka-integration-test.gradle.kts → ...entions/dokka-integration-test.gradle.kts b/...entions/dokka-integration-test.gradle.kts → ...entions/dokka-integration-test.gradle.kts
diff --git a/...rg/jetbrains/conventions/dokka.gradle.kts → ...rg/jetbrains/conventions/dokka.gradle.kts b/...rg/jetbrains/conventions/dokka.gradle.kts → ...rg/jetbrains/conventions/dokka.gradle.kts
diff --git a/...tbrains/conventions/kotlin-jvm.gradle.kts → ...tbrains/conventions/kotlin-jvm.gradle.kts b/...tbrains/conventions/kotlin-jvm.gradle.kts → ...tbrains/conventions/kotlin-jvm.gradle.kts
diff --git a/...ains/conventions/maven-publish.gradle.kts → ...ains/conventions/maven-publish.gradle.kts b/...ains/conventions/maven-publish.gradle.kts → ...ains/conventions/maven-publish.gradle.kts
diff --git a/...main/kotlin/org/jetbrains/projectUtils.kt → ...main/kotlin/org/jetbrains/projectUtils.kt b/...main/kotlin/org/jetbrains/projectUtils.kt → ...main/kotlin/org/jetbrains/projectUtils.kt
diff --git a/.../main/kotlin/org/jetbrains/publication.kt → .../main/kotlin/org/jetbrains/publication.kt b/.../main/kotlin/org/jetbrains/publication.kt → .../main/kotlin/org/jetbrains/publication.kt
diff --git a/...rc/main/kotlin/org/jetbrains/taskUtils.kt → ...rc/main/kotlin/org/jetbrains/taskUtils.kt b/...rc/main/kotlin/org/jetbrains/taskUtils.kt → ...rc/main/kotlin/org/jetbrains/taskUtils.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.ValidatePublications
 import org.jetbrains.publicationChannels
 
 plugins {
-    org.jetbrains.conventions.base
+    id("org.jetbrains.conventions.base")
     id("org.jetbrains.dokka")
     id("io.github.gradle-nexus.publish-plugin")
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -47,6 +47,8 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
     }
+
+    includeBuild("build-logic")
 }
 
 plugins {

diff --git 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 {