From d1b352d30bcc0506ab8ca5f5ceedc486ca67a45a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 00:17:36 +0000 Subject: [PATCH 1/2] Bump com.diffplug.spotless from 5.15.0 to 5.15.2 Bumps com.diffplug.spotless from 5.15.0 to 5.15.2. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 71409e7c8a..c874ba28f5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "com.diffplug.spotless" version "5.15.0" + id "com.diffplug.spotless" version "5.15.2" id "org.sonarqube" version "3.3" id "name.remal.sonarlint" version "1.5.0" } From 6bcace64be1f438bb5d71a45b967dbcab5e6817a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Radosavljevi=C4=87?= Date: Tue, 28 Sep 2021 15:27:33 +0200 Subject: [PATCH 2/2] Fix spotless 5.15.1/5.15.2 breaking formatting Hardcodes eclipse version to last known working version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c874ba28f5..27aa57ef00 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ subprojects { java { // Excludes build folder since it contains generated java classes. targetExclude("build/**") - eclipse().configFile("${rootProject.rootDir}/meta/formatting/google-style-eclipse.xml") + eclipse('4.19.0').configFile("${rootProject.rootDir}/meta/formatting/google-style-eclipse.xml") } } }