Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency com.diffplug.spotless:spotless-plugin-gradle to v7 #29

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/nessie-common-base.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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/**")
Expand Down
6 changes: 3 additions & 3 deletions build-logic/src/main/kotlin/nessie-common-src.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ plugins.withType<JavaPlugin>().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")}",
)
}
}
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
}
Expand Down
10 changes: 5 additions & 5 deletions build-logic/src/main/kotlin/nessie-testing.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -84,7 +84,7 @@ tasks.withType<Test>().configureEach {
listOf(
"-Dquarkus.log.level=${testLogLevel("INFO")}",
"-Dquarkus.log.console.level=${testLogLevel("INFO")}",
"-Dhttp.access.log.level=${testLogLevel()}"
"-Dhttp.access.log.level=${testLogLevel()}",
)
}
)
Expand Down
2 changes: 1 addition & 1 deletion gradle/baselibs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
4 changes: 2 additions & 2 deletions object-store-bench/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ tasks.named<AntlrTask>("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;",
),
)
)
}
Expand Down