From 6be9d81bc2838f025d4359ed9f7544d60241d9cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 00:07:38 +0000 Subject: [PATCH 1/2] Update dependency com.diffplug.spotless:spotless-plugin-gradle to v7 --- gradle/baselibs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/baselibs.versions.toml b/gradle/baselibs.versions.toml index 179e59a..916c6d2 100644 --- a/gradle/baselibs.versions.toml +++ b/gradle/baselibs.versions.toml @@ -7,4 +7,4 @@ idea-ext = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle jandex = { module = "com.github.vlsi.gradle:jandex-plugin", version = "1.90" } junit-bom = { module = "org.junit:junit-bom", version = "5.11.4" } shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" } -spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" } +spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.0.2" } From 98416a043d717871506a02da1e7d4213f8d88d97 Mon Sep 17 00:00:00 2001 From: Robert Stupp Date: Mon, 20 Jan 2025 13:35:14 +0100 Subject: [PATCH 2/2] commas! --- .../src/main/kotlin/nessie-common-base.gradle.kts | 2 +- .../src/main/kotlin/nessie-common-src.gradle.kts | 6 +++--- .../src/main/kotlin/nessie-conventions-root.gradle.kts | 2 +- build-logic/src/main/kotlin/nessie-testing.gradle.kts | 10 +++++----- object-store-bench/build.gradle.kts | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build-logic/src/main/kotlin/nessie-common-base.gradle.kts b/build-logic/src/main/kotlin/nessie-common-base.gradle.kts index 40f0fc7..d050f23 100644 --- a/build-logic/src/main/kotlin/nessie-common-base.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-common-base.gradle.kts @@ -83,7 +83,7 @@ if (!System.getProperty("idea.sync.active").toBoolean()) { scalafmt() licenseHeaderFile( rootProject.file("codestyle/copyright-header-java.txt"), - "^(package|import) .*$" + "^(package|import) .*$", ) target("src/**/scala/**") targetExclude("build-logic/build/**") diff --git a/build-logic/src/main/kotlin/nessie-common-src.gradle.kts b/build-logic/src/main/kotlin/nessie-common-src.gradle.kts index 3a9bb04..ff84634 100644 --- a/build-logic/src/main/kotlin/nessie-common-src.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-common-src.gradle.kts @@ -153,11 +153,11 @@ plugins.withType().configureEach { dependencies { add( "errorprone", - "com.google.errorprone:error_prone_core:${libsRequiredVersion("errorprone")}" + "com.google.errorprone:error_prone_core:${libsRequiredVersion("errorprone")}", ) add( "errorprone", - "jp.skypencil.errorprone.slf4j:errorprone-slf4j:${libsRequiredVersion("errorproneSlf4j")}" + "jp.skypencil.errorprone.slf4j:errorprone-slf4j:${libsRequiredVersion("errorproneSlf4j")}", ) } } @@ -213,7 +213,7 @@ class MemoizedGitInfo { "Nessie-Build-Git-Describe" to gitDescribe, "Nessie-Build-Timestamp" to timestamp, "Nessie-Build-System" to system, - "Nessie-Build-Java-Version" to javaVersion + "Nessie-Build-Java-Version" to javaVersion, ) rootProject.extra["gitReleaseInfo"] = info return info diff --git a/build-logic/src/main/kotlin/nessie-conventions-root.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-root.gradle.kts index 48c2968..0e3d897 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-root.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-conventions-root.gradle.kts @@ -48,7 +48,7 @@ if (System.getProperty("idea.sync.active").toBoolean()) { // Do not index the .mvn folders nessieRootProjectDir.resolve(".mvn"), // And more... - nessieRootProjectDir.resolve(".idea") + nessieRootProjectDir.resolve(".idea"), ) allprojects.map { prj -> prj.layout.buildDirectory.asFile.get() } } diff --git a/build-logic/src/main/kotlin/nessie-testing.gradle.kts b/build-logic/src/main/kotlin/nessie-testing.gradle.kts index a2801b4..20cb0d6 100644 --- a/build-logic/src/main/kotlin/nessie-testing.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-testing.gradle.kts @@ -28,24 +28,24 @@ plugins { gradle.sharedServices.registerIfAbsent( "intTestParallelismConstraint", - TestingParallelismHelper::class.java + TestingParallelismHelper::class.java, ) { val intTestParallelism = Integer.getInteger( "nessie.intTestParallelism", - (Runtime.getRuntime().availableProcessors() / 4).coerceAtLeast(1) + (Runtime.getRuntime().availableProcessors() / 4).coerceAtLeast(1), ) maxParallelUsages = intTestParallelism } gradle.sharedServices.registerIfAbsent( "testParallelismConstraint", - TestingParallelismHelper::class.java + TestingParallelismHelper::class.java, ) { val intTestParallelism = Integer.getInteger( "nessie.testParallelism", - (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1) + (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1), ) maxParallelUsages = intTestParallelism } @@ -84,7 +84,7 @@ tasks.withType().configureEach { listOf( "-Dquarkus.log.level=${testLogLevel("INFO")}", "-Dquarkus.log.console.level=${testLogLevel("INFO")}", - "-Dhttp.access.log.level=${testLogLevel()}" + "-Dhttp.access.log.level=${testLogLevel()}", ) } ) diff --git a/object-store-bench/build.gradle.kts b/object-store-bench/build.gradle.kts index 1b0e315..3321188 100644 --- a/object-store-bench/build.gradle.kts +++ b/object-store-bench/build.gradle.kts @@ -137,8 +137,8 @@ tasks.named("generateGrammarSource").configure { }, mapOf( "org.antlr.v4.runtime." to "org.projectnessie.shaded.org.antlr.v4.runtime.", - "// PACKAGE_PLACEHOLDER" to "package org.projectnessie.tools.objectstorebench.syntax;" - ) + "// PACKAGE_PLACEHOLDER" to "package org.projectnessie.tools.objectstorebench.syntax;", + ), ) ) }