From 2e4197ec7a99482a090d3f5a7da70f040e497e98 Mon Sep 17 00:00:00 2001 From: Laurent Goujon Date: Thu, 15 Dec 2022 14:55:19 -0800 Subject: [PATCH 1/3] Fix typo in gradle properties Fix typo in constant used by gradle scripts: ECLISPE -> ECLIPSE --- _ext/eclipse-cdt/build.gradle | 4 ++-- _ext/eclipse-cdt/gradle.properties | 4 ++-- _ext/eclipse-groovy/build.gradle | 2 +- _ext/eclipse-groovy/gradle.properties | 2 +- _ext/eclipse-wtp/build.gradle | 10 +++++----- _ext/eclipse-wtp/gradle.properties | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/_ext/eclipse-cdt/build.gradle b/_ext/eclipse-cdt/build.gradle index 17819f4a2e..93ccac3b24 100644 --- a/_ext/eclipse-cdt/build.gradle +++ b/_ext/eclipse-cdt/build.gradle @@ -19,13 +19,13 @@ apply from: rootProject.file('gradle/java-publish.gradle') dependencies { implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}" // Provides text partitioners for formatters - implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") { + implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") { exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt' } // Required to by CCorePlugin calling CDTLogWriter implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}" // Required to by CCorePlugin calling PositionTrackerManager - implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_EFS}" + implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_EFS}" testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}") } diff --git a/_ext/eclipse-cdt/gradle.properties b/_ext/eclipse-cdt/gradle.properties index 9c1c8a7ee6..10166b51d0 100644 --- a/_ext/eclipse-cdt/gradle.properties +++ b/_ext/eclipse-cdt/gradle.properties @@ -7,6 +7,6 @@ VER_JAVA=11 # Compile dependencies VER_ECLIPSE_CDT=10.5 VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[ -VER_ECLISPE_JFACE=[3.18.0,4.0.0[ -VER_ECLISPE_EFS=[3.7.0,4.0.0[ +VER_ECLIPSE_JFACE=[3.18.0,4.0.0[ +VER_ECLIPSE_EFS=[3.7.0,4.0.0[ VER_IBM_ICU=[67.1,68[ diff --git a/_ext/eclipse-groovy/build.gradle b/_ext/eclipse-groovy/build.gradle index e1382acd76..00a7fed489 100644 --- a/_ext/eclipse-groovy/build.gradle +++ b/_ext/eclipse-groovy/build.gradle @@ -41,7 +41,7 @@ apply from: rootProject.file('gradle/java-publish.gradle') dependencies { implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}" // Provides text partitioners for formatters - implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") { + implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") { exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt' } testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}") diff --git a/_ext/eclipse-groovy/gradle.properties b/_ext/eclipse-groovy/gradle.properties index b8a21001fd..9569e765bc 100644 --- a/_ext/eclipse-groovy/gradle.properties +++ b/_ext/eclipse-groovy/gradle.properties @@ -7,7 +7,7 @@ VER_JAVA=11 # Compile VER_ECLIPSE=4.21 VER_SPOTLESS_ECLISPE_BASE=[3.4.2,4.0.0[ -VER_ECLISPE_JFACE=[3.15.300,4.0.0[ +VER_ECLIPSE_JFACE=[3.15.300,4.0.0[ VER_GRECLIPSE=4.3.0 VER_GROOVY=4.0.0 # Use org.eclipse.jdt.core patched for Groovy-Eclipse diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle index 4001e100c2..ba32385a1b 100644 --- a/_ext/eclipse-wtp/build.gradle +++ b/_ext/eclipse-wtp/build.gradle @@ -64,20 +64,20 @@ dependencies { // Required by most WPT formatters implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}" // The XSD/DTD and other models are defined with EMF. - implementation "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLISPE_EMF}" - implementation "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLISPE_EMF}" + implementation "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLIPSE_EMF}" + implementation "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLIPSE_EMF}" // Some WPT plugins requires OSGI bundle interfaces (but not effectively used) implementation "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLIPSE_OSGI_SERVICES}" // Provides document data structure and file buffers for formatters implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_FILE_BUFFERS}" // Provides text partitioners for formatters - implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") { + implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") { exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt' } // Some WPT plugins use the EFS for storing temporary worspace data - implementation "org.eclipse.platform:org.eclipse.core.filesystem:${VER_ECLISPE_EFS}" + implementation "org.eclipse.platform:org.eclipse.core.filesystem:${VER_ECLIPSE_EFS}" // Required by org.eclipse.wst.xsd.core - implementation "org.eclipse.emf:org.eclipse.xsd:${VER_ECLISPE_XSD}" + implementation "org.eclipse.emf:org.eclipse.xsd:${VER_ECLIPSE_XSD}" testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}") } diff --git a/_ext/eclipse-wtp/gradle.properties b/_ext/eclipse-wtp/gradle.properties index 743748d1ba..f6cedd63e3 100644 --- a/_ext/eclipse-wtp/gradle.properties +++ b/_ext/eclipse-wtp/gradle.properties @@ -8,9 +8,9 @@ VER_JAVA=11 VER_ECLIPSE_WTP=2021-09 VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[ VER_IBM_ICU=[67.1,68[ -VER_ECLISPE_EMF=[2.22.0,3.0.0[ +VER_ECLIPSE_EMF=[2.22.0,3.0.0[ VER_ECLIPSE_OSGI_SERVICES=[3.10.0,4.0.0[ VER_ECLIPSE_FILE_BUFFERS=[3.7.0,4.0.0[ -VER_ECLISPE_JFACE=[3.18.0,4.0.0[ -VER_ECLISPE_EFS=[1.9.0,2.0.0[ -VER_ECLISPE_XSD=[2.18.0,3.0.0[ +VER_ECLIPSE_JFACE=[3.18.0,4.0.0[ +VER_ECLIPSE_EFS=[1.9.0,2.0.0[ +VER_ECLIPSE_XSD=[2.18.0,3.0.0[ From fd6cd9a36ef70f68a128169e93d3430604101b94 Mon Sep 17 00:00:00 2001 From: Laurent Goujon Date: Thu, 15 Dec 2022 15:14:31 -0800 Subject: [PATCH 2/3] Add missing typo --- _ext/eclipse-cdt/build.gradle | 2 +- _ext/eclipse-cdt/gradle.properties | 2 +- _ext/eclipse-groovy/build.gradle | 2 +- _ext/eclipse-groovy/gradle.properties | 2 +- _ext/eclipse-jdt/build.gradle | 2 +- _ext/eclipse-jdt/gradle.properties | 2 +- _ext/eclipse-wtp/build.gradle | 2 +- _ext/eclipse-wtp/gradle.properties | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_ext/eclipse-cdt/build.gradle b/_ext/eclipse-cdt/build.gradle index 93ccac3b24..0982b7d555 100644 --- a/_ext/eclipse-cdt/build.gradle +++ b/_ext/eclipse-cdt/build.gradle @@ -17,7 +17,7 @@ apply from: rootProject.file('gradle/java-publish.gradle') dependencies { - implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}" + implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}" // Provides text partitioners for formatters implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") { exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt' diff --git a/_ext/eclipse-cdt/gradle.properties b/_ext/eclipse-cdt/gradle.properties index 10166b51d0..821ceea4d1 100644 --- a/_ext/eclipse-cdt/gradle.properties +++ b/_ext/eclipse-cdt/gradle.properties @@ -6,7 +6,7 @@ VER_JAVA=11 # Compile dependencies VER_ECLIPSE_CDT=10.5 -VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[ +VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[ VER_ECLIPSE_JFACE=[3.18.0,4.0.0[ VER_ECLIPSE_EFS=[3.7.0,4.0.0[ VER_IBM_ICU=[67.1,68[ diff --git a/_ext/eclipse-groovy/build.gradle b/_ext/eclipse-groovy/build.gradle index 00a7fed489..a45590fada 100644 --- a/_ext/eclipse-groovy/build.gradle +++ b/_ext/eclipse-groovy/build.gradle @@ -39,7 +39,7 @@ apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle') apply from: rootProject.file('gradle/java-publish.gradle') dependencies { - implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}" + implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}" // Provides text partitioners for formatters implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") { exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt' diff --git a/_ext/eclipse-groovy/gradle.properties b/_ext/eclipse-groovy/gradle.properties index 9569e765bc..c1c6101caa 100644 --- a/_ext/eclipse-groovy/gradle.properties +++ b/_ext/eclipse-groovy/gradle.properties @@ -6,7 +6,7 @@ VER_JAVA=11 # Compile VER_ECLIPSE=4.21 -VER_SPOTLESS_ECLISPE_BASE=[3.4.2,4.0.0[ +VER_SPOTLESS_ECLIPSE_BASE=[3.4.2,4.0.0[ VER_ECLIPSE_JFACE=[3.15.300,4.0.0[ VER_GRECLIPSE=4.3.0 VER_GROOVY=4.0.0 diff --git a/_ext/eclipse-jdt/build.gradle b/_ext/eclipse-jdt/build.gradle index b0967822a9..283e52f86d 100644 --- a/_ext/eclipse-jdt/build.gradle +++ b/_ext/eclipse-jdt/build.gradle @@ -10,7 +10,7 @@ ext { } dependencies { - implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}" + implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}" implementation("org.eclipse.jdt:org.eclipse.jdt.core:${VER_ECLIPSE_JDT_CORE}") { exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core' exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions' diff --git a/_ext/eclipse-jdt/gradle.properties b/_ext/eclipse-jdt/gradle.properties index 82a4423140..51d5f41014 100644 --- a/_ext/eclipse-jdt/gradle.properties +++ b/_ext/eclipse-jdt/gradle.properties @@ -6,4 +6,4 @@ VER_JAVA=11 # Compile VER_ECLIPSE_JDT_CORE=[3.13.0,4.0.0[ -VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[ +VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[ diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle index ba32385a1b..92a78578f6 100644 --- a/_ext/eclipse-wtp/build.gradle +++ b/_ext/eclipse-wtp/build.gradle @@ -60,7 +60,7 @@ apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle') apply from: rootProject.file('gradle/java-publish.gradle') dependencies { - implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}" + implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}" // Required by most WPT formatters implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}" // The XSD/DTD and other models are defined with EMF. diff --git a/_ext/eclipse-wtp/gradle.properties b/_ext/eclipse-wtp/gradle.properties index f6cedd63e3..a341c0fb49 100644 --- a/_ext/eclipse-wtp/gradle.properties +++ b/_ext/eclipse-wtp/gradle.properties @@ -6,7 +6,7 @@ VER_JAVA=11 # Compile VER_ECLIPSE_WTP=2021-09 -VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[ +VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[ VER_IBM_ICU=[67.1,68[ VER_ECLIPSE_EMF=[2.22.0,3.0.0[ VER_ECLIPSE_OSGI_SERVICES=[3.10.0,4.0.0[ From 7949f87aced31c56b6fbc86d9370dd7163816c90 Mon Sep 17 00:00:00 2001 From: Laurent Goujon Date: Thu, 15 Dec 2022 15:11:01 -0800 Subject: [PATCH 3/3] Update CHANGES.md --- _ext/eclipse-cdt/CHANGES.md | 2 ++ _ext/eclipse-groovy/CHANGES.md | 2 ++ _ext/eclipse-wtp/CHANGES.md | 2 ++ 3 files changed, 6 insertions(+) diff --git a/_ext/eclipse-cdt/CHANGES.md b/_ext/eclipse-cdt/CHANGES.md index bdc7d99ea9..cda212bd3d 100644 --- a/_ext/eclipse-cdt/CHANGES.md +++ b/_ext/eclipse-cdt/CHANGES.md @@ -3,6 +3,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `9.9.0`). ## [Unreleased] +### Fixed +* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425)) ## [10.5.0] - 2021-12-13 ### Added diff --git a/_ext/eclipse-groovy/CHANGES.md b/_ext/eclipse-groovy/CHANGES.md index c80ce061d5..b0f909ccb2 100644 --- a/_ext/eclipse-groovy/CHANGES.md +++ b/_ext/eclipse-groovy/CHANGES.md @@ -3,6 +3,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.5.0`). ## [Unreleased] +### Fixed +* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425)) ## [4.3.0] - 2021-10-13 ### Added diff --git a/_ext/eclipse-wtp/CHANGES.md b/_ext/eclipse-wtp/CHANGES.md index 6fc919aa0e..0001618b1f 100644 --- a/_ext/eclipse-wtp/CHANGES.md +++ b/_ext/eclipse-wtp/CHANGES.md @@ -3,6 +3,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.15.1`). ## [Unreleased] +### Fixed +* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425)) ## [3.23.0] - 2021-09-22 ### Added