diff --git a/gradle.properties b/gradle.properties index 5adafd62cc..058007ccc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,6 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8 org.gradle.parallel=true org.gradle.caching=true org.gradle.configuration-cache=true -# Parallel fingerprinting of eclipse()/greclipse() steps races Solstice's on-disk -# P2 cache, failing as "Cannot fingerprint input property 'stepsInternalEquality'" -# / "Failed to provision P2 dependencies". We format ourselves with the *published* -# plugin (see settings.gradle), so the fix in this repo can't help until it ships. -# Re-enable once settings.gradle pins a Spotless containing the #3004 fix. -org.gradle.configuration-cache.parallel=false org.gradle.tooling.parallel=true name=spotless @@ -25,4 +19,3 @@ artifactIdTestLib=spotless-testlib artifactIdMaven=spotless-maven-plugin artifactIdGradle=spotless-plugin-gradle - diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle index a8b3a99654..0fc643a634 100644 --- a/gradle/changelog.gradle +++ b/gradle/changelog.gradle @@ -17,10 +17,10 @@ apply plugin: 'com.diffplug.spotless-changelog' spotlessChangelog { changelogFile 'CHANGES.md' // need -Prelease=true in order to do a publish - appendDashSnapshotUnless_dashPrelease=true + appendDashSnapshotUnless_dashPrelease =true - branch 'release' - tagPrefix "${kind}/" + branch 'release' + tagPrefix "${kind}/" commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced tagMessage "{{changes}}" runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag" diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle index d9f4932141..e6c36dc566 100644 --- a/gradle/java-publish.gradle +++ b/gradle/java-publish.gradle @@ -65,7 +65,9 @@ tasks.named('check') { } // use markdown in javadoc -def makeLink = { url, text -> "${text}" } +def makeLink = { url, text -> + "${text}" +} def javadocInfo = '

' + makeLink("https://github.com/${org}/${name}", "${group}:${project.ext.artifactId}:${version}") + ' by ' + makeLink('https://www.diffplug.com', 'DiffPlug') + '

' diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle index d73cde3f32..4f624d3fb5 100644 --- a/gradle/java-setup.gradle +++ b/gradle/java-setup.gradle @@ -14,7 +14,7 @@ tasks.withType(JavaCompile).configureEach { ////////////// apply plugin: 'com.github.spotbugs' spotbugs { - ignoreFailures = false // bug free or it doesn't ship! + ignoreFailures = false // bug free or it doesn't ship! // LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes). reportLevel = com.github.spotbugs.snom.Confidence.valueOf('MEDIUM') omitVisitors = [ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6441c63085..04e3313984 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -67,7 +67,7 @@ errorprone-core = "com.google.errorprone:error_prone_core:2.42.0" [plugins] test-logger = "com.adarshr.test-logger:4.0.0" -spotless = "com.diffplug.spotless:8.7.0" +spotless = "com.diffplug.spotless:8.10.0" spotless-changelog = "com.diffplug.spotless-changelog:3.1.2" spotbugs = "com.github.spotbugs:6.5.10" plugin-publish = "com.gradle.plugin-publish:2.1.1" diff --git a/gradle/spotless-freshmark.gradle b/gradle/spotless-freshmark.gradle index d4f72a3344..9608cb2cbb 100644 --- a/gradle/spotless-freshmark.gradle +++ b/gradle/spotless-freshmark.gradle @@ -51,7 +51,7 @@ if (tasks.names.contains('changelogCheck')) { // this git add should run after the freshmark dependsOn(changelogBumpFreshmark) // do the git add - commandLine 'git', 'add' , '*.md' + commandLine 'git', 'add', '*.md' } tasks.named('changelogPush').configure { dependsOn changelogBumpFreshmarkGitAdd diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index 4202d3e62b..5862a633ea 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -6,7 +6,7 @@ spotless { ratchetFrom 'origin/main' bumpThisNumberIfACustomStepChanges(1) licenseHeaderFile rootProject.file('gradle/spotless.license') - importOrderFile rootProject.file('gradle/spotless.importorder') + importOrderFile rootProject.file('gradle/spotless.importorder') eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml') trimTrailingWhitespace() removeUnusedImports() diff --git a/lib/build.gradle b/lib/build.gradle index fbfddf163c..a38adbefbc 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -117,7 +117,7 @@ dependencies { compatKtLint1Dot0Dot0CompileAndTestOnly libs.ktlint.ruleset.standard compatKtLint1Dot0Dot0CompileAndTestOnly libs.slf4j.api // palantirJavaFormat - palantirJavaFormatCompileOnly libs.palantir.java.format // this version needs to stay compilable against Java 8 for CI Job testNpm + palantirJavaFormatCompileOnly libs.palantir.java.format // this version needs to stay compilable against Java 8 for CI Job testNpm // princeOfSpace princeOfSpaceCompileOnly libs.prince.of.space.core // scalafmt diff --git a/settings.gradle b/settings.gradle index 50db6e3de9..5cfd9fdf64 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ pluginManagement { } plugins { - id 'com.diffplug.spotless' version '8.7.0' apply false + id 'com.diffplug.spotless' version '8.10.0' apply false id 'com.github.spotbugs' version '6.5.10' apply false // https://github.com/spotbugs/spotbugs-gradle-plugin/releases id 'com.gradle.develocity' version '4.5.0' } @@ -63,8 +63,8 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") rootProject.name = 'spotless' include 'lib' // reusable library with no dependencies -include 'lib-extra' // reusable library with lots of dependencies -include 'plugin-gradle' // gradle-specific glue code +include 'lib-extra' // reusable library with lots of dependencies +include 'plugin-gradle' // gradle-specific glue code include 'testlib' // library for sharing test infrastructure between the projects below def getStartProperty(String name) {