diff options
47 files changed, 66 insertions, 59 deletions
diff --git a/build-logic/README.md b/build-logic/README.md new file mode 100644 index 00000000..e8d18cbd --- /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 index 00733d64..0c054c5c 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 index 2144de34..55dfe5c1 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 index 715dde2f..715dde2f 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/CrossPlatformExec.kt +++ b/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 index 03f607e8..03f607e8 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt +++ b/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 index 517c7731..517c7731 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt +++ b/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 index 077cd854..077cd854 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersionType.kt +++ b/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 index a1b59a50..a1b59a50 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt +++ b/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 index af35a847..af35a847 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/ValidatePublications.kt +++ b/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 index 3addac74..2073f9a2 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 index c4352d16..c4352d16 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/conventions/base.gradle.kts +++ b/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 index 612502cd..f9edb68e 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 index 9a193cbb..9a193cbb 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/conventions/dokka.gradle.kts +++ b/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 index c40ce57c..c40ce57c 100644 --- 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 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 index 7007fd9e..7007fd9e 100644 --- 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 diff --git a/buildSrc/src/main/kotlin/org/jetbrains/projectUtils.kt b/build-logic/src/main/kotlin/org/jetbrains/projectUtils.kt index 46d803a5..46d803a5 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/projectUtils.kt +++ b/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 index 60d91c33..60d91c33 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/publication.kt +++ b/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 index 261d1663..261d1663 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt +++ b/build-logic/src/main/kotlin/org/jetbrains/taskUtils.kt diff --git a/build.gradle.kts b/build.gradle.kts index 08373920..76067b75 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 1d7c1f17..a59bb0a5 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 1a95f1cd..4ddba0fb 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 b3f57010..b9137009 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 80c07b37..fd1d7746 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 71d36a9b..c0cb46ee 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 3f3be54b..f47ef670 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 0a2cb7c4..4b8b6011 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 e2cb50e0..36dc58c4 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 bbea28dd..f18b6f49 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 732b9d80..ad9d74e8 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 cd07d9b3..ef91b9ee 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 e1293520..e0766ab4 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 b7d02115..36ff2011 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 089e26d1..2bbfaa8c 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 bb97cdd3..8892362b 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 450b33a2..41790b44 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 c41256ca..f2920730 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 483c58b3..1291c56d 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 9845a993..6cfb48f2 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 1b759efb..97989697 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 07ac053b..4219a66b 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 d4909d9b..c4d91993 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 0c7ee0a4..eafd094f 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 b522dbdd..5461837e 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 0b6908d4..5ce70dcc 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 6cd0395e..f8badf8e 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 91023501..9794dd18 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 c80472fd..6bd501b7 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 { |