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

Fix typo in gradle properties #1425

Merged
merged 3 commits into from
Dec 18, 2022
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
2 changes: 2 additions & 0 deletions _ext/eclipse-cdt/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions _ext/eclipse-cdt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ 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_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}")
}
Expand Down
6 changes: 3 additions & 3 deletions _ext/eclipse-cdt/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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_ECLISPE_JFACE=[3.18.0,4.0.0[
VER_ECLISPE_EFS=[3.7.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[
2 changes: 2 additions & 0 deletions _ext/eclipse-groovy/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions _ext/eclipse-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ 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_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}")
Expand Down
4 changes: 2 additions & 2 deletions _ext/eclipse-groovy/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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_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
# Use org.eclipse.jdt.core patched for Groovy-Eclipse
Expand Down
2 changes: 1 addition & 1 deletion _ext/eclipse-jdt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion _ext/eclipse-jdt/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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[
2 changes: 2 additions & 0 deletions _ext/eclipse-wtp/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions _ext/eclipse-wtp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,24 @@ 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.
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}")
}
Expand Down
10 changes: 5 additions & 5 deletions _ext/eclipse-wtp/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ 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_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[