Skip to content
Merged
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
7 changes: 0 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,4 +19,3 @@ artifactIdTestLib=spotless-testlib
artifactIdMaven=spotless-maven-plugin

artifactIdGradle=spotless-plugin-gradle

6 changes: 3 additions & 3 deletions gradle/changelog.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion gradle/java-publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ tasks.named('check') {
}

// use markdown in javadoc
def makeLink = { url, text -> "<a href=\"${url}\" style=\"text-transform: none;\">${text}</a>" }
def makeLink = { url, text ->
"<a href=\"${url}\" style=\"text-transform: none;\">${text}</a>"
}
def javadocInfo = '<h2>' + makeLink("https://github.com/${org}/${name}", "${group}:${project.ext.artifactId}:${version}") +
' by ' + makeLink('https://www.diffplug.com', 'DiffPlug') + '</h2>'

Expand Down
2 changes: 1 addition & 1 deletion gradle/java-setup.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/spotless-freshmark.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/spotless.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down Expand Up @@ -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) {
Expand Down
Loading