From 491767fb08ba7841e3f54c190718ffedc315f484 Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Fri, 16 Jan 2026 17:47:47 +0100 Subject: [PATCH] reformat indent in gradle build-logic files --- .../build-logic.gradle-conventions.gradle.kts | 8 +-- .../build-parameters/build.gradle.kts | 66 +++++++++---------- gradle/build-logic/build.gradle.kts | 4 +- gradle/build-logic/dev/build.gradle.kts | 4 +- .../dev/src/main/kotlin/DokkaExtensions.kt | 6 +- .../main/kotlin/build-logic.java.gradle.kts | 40 +++++------ .../build-logic.kotlin-conventions.gradle.kts | 2 +- .../kotlin/build-logic.kotlin-jvm.gradle.kts | 6 +- .../build-logic/publishing/build.gradle.kts | 6 +- .../main/kotlin/build-logic.dokka.gradle.kts | 16 ++--- gradle/build-logic/settings.gradle.kts | 10 +-- gradle/code-generation/settings.gradle.kts | 10 +-- 12 files changed, 89 insertions(+), 89 deletions(-) diff --git a/gradle/build-logic/basics/src/main/kotlin/build-logic.gradle-conventions.gradle.kts b/gradle/build-logic/basics/src/main/kotlin/build-logic.gradle-conventions.gradle.kts index 5e5baedd..e5a78c45 100644 --- a/gradle/build-logic/basics/src/main/kotlin/build-logic.gradle-conventions.gradle.kts +++ b/gradle/build-logic/basics/src/main/kotlin/build-logic.gradle-conventions.gradle.kts @@ -1,7 +1,7 @@ plugins { - // plugins we use in all gradle projects - id("build-logic.build-params") - id("com.github.vlsi.gradle-extensions") - // enable to analyse task dependencies + // plugins we use in all gradle projects + id("build-logic.build-params") + id("com.github.vlsi.gradle-extensions") + // enable to analyse task dependencies // id("com.dorongold.task-tree") } diff --git a/gradle/build-logic/build-parameters/build.gradle.kts b/gradle/build-logic/build-parameters/build.gradle.kts index cb0fc83d..cee25a6d 100644 --- a/gradle/build-logic/build-parameters/build.gradle.kts +++ b/gradle/build-logic/build-parameters/build.gradle.kts @@ -1,47 +1,47 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { - id("build-logic.kotlin-dsl-gradle-plugin") + id("build-logic.kotlin-dsl-gradle-plugin") alias(buildLibs.plugins.build.parameters) } buildParameters { - pluginId("build-logic.build-params") + pluginId("build-logic.build-params") - // Other plugins can contribute parameters, so below list is not exhaustive, hence we disable the validation - enableValidation.set(false) + // Other plugins can contribute parameters, so below list is not exhaustive, hence we disable the validation + enableValidation.set(false) - val defaultJdkVersion = 11 - integer("defaultJdkVersion") { - defaultValue.set(defaultJdkVersion) - mandatory.set(true) - description.set("Default jdk version for source and target compatibility") - } + val defaultJdkVersion = 11 + integer("defaultJdkVersion") { + defaultValue.set(defaultJdkVersion) + mandatory.set(true) + description.set("Default jdk version for source and target compatibility") + } group("kotlin") { - string("version") { - fromEnvironment() + string("version") { + fromEnvironment() // we use enumEntries which is only available since 1.9, thus min requirement 1.9 - defaultValue.set(KotlinVersion.KOTLIN_1_9.version) - description.set("kotlin version used for apiVersion and languageVersion") - } - bool("werror") { - defaultValue.set(true) - description.set("Treat kotlinc warnings as errors") - } - } - - - group("java") { - integer("version") { - fromEnvironment() - defaultValue.set(defaultJdkVersion) - description.set("Java version used for java.toolchain") - } - bool("werror") { - defaultValue.set(true) - description.set("Treat javac, javadoc, warnings as errors") - } - } + defaultValue.set(KotlinVersion.KOTLIN_1_9.version) + description.set("kotlin version used for apiVersion and languageVersion") + } + bool("werror") { + defaultValue.set(true) + description.set("Treat kotlinc warnings as errors") + } + } + + + group("java") { + integer("version") { + fromEnvironment() + defaultValue.set(defaultJdkVersion) + description.set("Java version used for java.toolchain") + } + bool("werror") { + defaultValue.set(true) + description.set("Treat javac, javadoc, warnings as errors") + } + } } diff --git a/gradle/build-logic/build.gradle.kts b/gradle/build-logic/build.gradle.kts index 65001940..cb80bd9b 100644 --- a/gradle/build-logic/build.gradle.kts +++ b/gradle/build-logic/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - `embedded-kotlin` apply false + `embedded-kotlin` apply false } allprojects { - group = "com.tegonal.variist.build-logic" + group = "com.tegonal.variist.build-logic" } diff --git a/gradle/build-logic/dev/build.gradle.kts b/gradle/build-logic/dev/build.gradle.kts index d1d21b29..44cb0386 100644 --- a/gradle/build-logic/dev/build.gradle.kts +++ b/gradle/build-logic/dev/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("build-logic.kotlin-dsl-gradle-plugin") + id("build-logic.kotlin-dsl-gradle-plugin") } dependencies { - api(projects.basics) + api(projects.basics) api(buildLibs.kotlin) api(buildLibs.bundles.dokka) diff --git a/gradle/build-logic/dev/src/main/kotlin/DokkaExtensions.kt b/gradle/build-logic/dev/src/main/kotlin/DokkaExtensions.kt index ead02a4f..2229f3ab 100644 --- a/gradle/build-logic/dev/src/main/kotlin/DokkaExtensions.kt +++ b/gradle/build-logic/dev/src/main/kotlin/DokkaExtensions.kt @@ -3,7 +3,7 @@ import org.jetbrains.dokka.base.DokkaBaseConfiguration import org.jetbrains.dokka.gradle.AbstractDokkaTask fun AbstractDokkaTask.configurePlugins() { - pluginConfiguration { - footerMessage = "Variist © Copyright Tegonal Genossenschaft" - } + pluginConfiguration { + footerMessage = "Variist © Copyright Tegonal Genossenschaft" + } } diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.java.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.java.gradle.kts index cbfb45c8..83faca9f 100644 --- a/gradle/build-logic/dev/src/main/kotlin/build-logic.java.gradle.kts +++ b/gradle/build-logic/dev/src/main/kotlin/build-logic.java.gradle.kts @@ -1,29 +1,29 @@ plugins { - id("java-base") - id("build-logic.gradle-conventions") + id("java-base") + id("build-logic.gradle-conventions") } java { - toolchain { - // reading JAVA_VERSION from env to enable jdk17 build in CI - languageVersion.set(JavaLanguageVersion.of(buildParameters.java.version)) - } - consistentResolution { - useCompileClasspathVersions() - } + toolchain { + // reading JAVA_VERSION from env to enable jdk17 build in CI + languageVersion.set(JavaLanguageVersion.of(buildParameters.java.version)) + } + consistentResolution { + useCompileClasspathVersions() + } } tasks.configureEach { - inputs.property("java.version", System.getProperty("java.version")) - inputs.property("java.vm.version", System.getProperty("java.vm.version")) - sourceCompatibility = buildParameters.defaultJdkVersion.toString() - targetCompatibility = buildParameters.defaultJdkVersion.toString() - options.apply { - encoding = "UTF-8" - compilerArgs.add("-Xlint:deprecation") - if (buildParameters.java.werror) { - compilerArgs.add("-Werror") - } - } + inputs.property("java.version", System.getProperty("java.version")) + inputs.property("java.vm.version", System.getProperty("java.vm.version")) + sourceCompatibility = buildParameters.defaultJdkVersion.toString() + targetCompatibility = buildParameters.defaultJdkVersion.toString() + options.apply { + encoding = "UTF-8" + compilerArgs.add("-Xlint:deprecation") + if (buildParameters.java.werror) { + compilerArgs.add("-Werror") + } + } } diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts index 5c29cfde..65c933a2 100644 --- a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts +++ b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts @@ -11,7 +11,7 @@ plugins { } tasks.configureEach { - compilerOptions{ + compilerOptions { jvmTarget.set(JvmTarget.fromTarget(buildParameters.defaultJdkVersion.toString())) } } diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm.gradle.kts index 6c92e32a..8e512395 100644 --- a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm.gradle.kts +++ b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm.gradle.kts @@ -1,8 +1,8 @@ plugins { - kotlin("jvm") - id("build-logic.kotlin-conventions") + kotlin("jvm") + id("build-logic.kotlin-conventions") } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") } diff --git a/gradle/build-logic/publishing/build.gradle.kts b/gradle/build-logic/publishing/build.gradle.kts index d45da1e1..abf0a93a 100644 --- a/gradle/build-logic/publishing/build.gradle.kts +++ b/gradle/build-logic/publishing/build.gradle.kts @@ -1,10 +1,10 @@ plugins { - id("build-logic.kotlin-dsl-gradle-plugin") + id("build-logic.kotlin-dsl-gradle-plugin") } dependencies { - api(projects.basics) - api(projects.dev) + api(projects.basics) + api(projects.dev) api(buildLibs.bundles.dokka) api(buildLibs.tutteli.dokka) diff --git a/gradle/build-logic/publishing/src/main/kotlin/build-logic.dokka.gradle.kts b/gradle/build-logic/publishing/src/main/kotlin/build-logic.dokka.gradle.kts index 4401d584..edb9b7bc 100644 --- a/gradle/build-logic/publishing/src/main/kotlin/build-logic.dokka.gradle.kts +++ b/gradle/build-logic/publishing/src/main/kotlin/build-logic.dokka.gradle.kts @@ -2,27 +2,27 @@ import ch.tutteli.gradle.plugins.dokka.GhPages import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask plugins { - id("build-logic.gradle-conventions") - id("ch.tutteli.gradle.plugins.dokka") + id("build-logic.gradle-conventions") + id("ch.tutteli.gradle.plugins.dokka") } val kdocDir = rootProject.projectDir.resolve("misc/kdoc") tutteliDokka { - githubUser.set("tegonal") + githubUser.set("tegonal") writeTo.set(GhPages) } tasks.configureEach { moduleName.set("Variist") - dokkaSourceSets.configureEach { + dokkaSourceSets.configureEach { reportUndocumented.set(true) - jdkVersion.set(buildParameters.defaultJdkVersion) - includes.from(kdocDir.resolve("packages.md")) + jdkVersion.set(buildParameters.defaultJdkVersion) + includes.from(kdocDir.resolve("packages.md")) perPackageOption { matchingRegex.set("com\\.tegonal\\.variist\\.export\\..*") suppress.set(true) } - } - configurePlugins() + } + configurePlugins() } diff --git a/gradle/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts index 2e7a463d..e80e5518 100644 --- a/gradle/build-logic/settings.gradle.kts +++ b/gradle/build-logic/settings.gradle.kts @@ -1,14 +1,14 @@ rootProject.name = "build-logic" pluginManagement { - includeBuild("../build-logic-conventions") + includeBuild("../build-logic-conventions") } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - gradlePluginPortal() - } + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + gradlePluginPortal() + } versionCatalogs { create("libs") { from(files("../libs.versions.toml")) diff --git a/gradle/code-generation/settings.gradle.kts b/gradle/code-generation/settings.gradle.kts index 17daf091..69e68aa9 100644 --- a/gradle/code-generation/settings.gradle.kts +++ b/gradle/code-generation/settings.gradle.kts @@ -1,14 +1,14 @@ rootProject.name = "code-generation" pluginManagement { - includeBuild("../build-logic-conventions") + includeBuild("../build-logic-conventions") } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - gradlePluginPortal() - } + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + gradlePluginPortal() + } versionCatalogs { create("libs") { from(files("../libs.versions.toml"))