Skip to content

Commit

Permalink
Replace the deprecated 'compile' with 'implementation' for the `ext/e…
Browse files Browse the repository at this point in the history
…clipse-*` projects.
  • Loading branch information
nedtwigg committed Mar 26, 2020
1 parent 90b1f90 commit e542220
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 22 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
## [Unreleased]
### Fixed
* Javadoc for the `ext/eclipse-*` projects.
* Replace the deprecated `compile` with `implementation` for the `ext/eclipse-*` projects.

## [1.28.0] - 2020-03-20
### Added
Expand Down
4 changes: 2 additions & 2 deletions _ext/eclipse-base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ ext {
}

dependencies {
compile("org.eclipse.platform:org.eclipse.core.resources:${VER_ECLIPSE_CORE_RESOURCES}") {
implementation("org.eclipse.platform:org.eclipse.core.resources:${VER_ECLIPSE_CORE_RESOURCES}") {
exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core'
exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions'
exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.filesystem'
}
compile("org.slf4j:slf4j-api:${VER_SLF4J}")
implementation("org.slf4j:slf4j-api:${VER_SLF4J}")

testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
}
Expand Down
8 changes: 4 additions & 4 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 {
compile "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
// Provides text partitioners for formatters
compile ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
}
// Required to by CCorePlugin calling CDTLogWriter
compile "com.ibm.icu:icu4j:${VER_IBM_ICU}"
implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
// Required to by CCorePlugin calling PositionTrackerManager
compile "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_PLATFORM}"
implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_PLATFORM}"

testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
}
Expand Down
6 changes: 3 additions & 3 deletions _ext/eclipse-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ext {
]

p2Repository = "https://dist.springsource.org/release/GRECLIPSE/${VER_GRECLIPSE}/e${VER_ECLIPSE}"

p2Dependencies = [
'org.codehaus.groovy.eclipse.refactoring':'+', // GroovyFormatter and related

Expand Down Expand Up @@ -38,9 +38,9 @@ apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
apply from: rootProject.file('gradle/java-publish.gradle')

dependencies {
compile "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
// Provides text partitioners for formatters
compile ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_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-jdt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ext {
}

dependencies {
compile "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
compile("org.eclipse.jdt:org.eclipse.jdt.core:${VER_ECLIPSE_JDT_CORE}") {
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_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'
exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.filesystem'
Expand Down
20 changes: 10 additions & 10 deletions _ext/eclipse-wtp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ext {
]

p2Repository = "https://download.eclipse.org/webtools/repository/${VER_ECLIPSE_WTP}"

p2Dependencies = [
// XML/HTML Formatter - Dependencies
'org.eclipse.wst.xml.core':'+', // DefaultXMLPartitionFormatter and XMLAssociationProvider
Expand Down 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 {
compile "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
// Required by most WPT formatters
compile "com.ibm.icu:icu4j:${VER_IBM_ICU}"
implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
// The XSD/DTD and other models are defined with EMF.
compile "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLISPE_EMF}"
compile "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLISPE_EMF}"
implementation "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLISPE_EMF}"
implementation "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLISPE_EMF}"
// Some WPT plugins requires OSGI bundle interfaces (but not effectively used)
compile "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLIPSE_OSGI_SERVICES}"
implementation "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLIPSE_OSGI_SERVICES}"
// Provides document data structure and file buffers for formatters
compile "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_FILE_BUFFERS}"
implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_FILE_BUFFERS}"
// Provides text partitioners for formatters
compile ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
}
// Some WPT plugins use the EFS for storing temporary worspace data
compile "org.eclipse.platform:org.eclipse.core.filesystem:${VER_ECLISPE_EFS}"
implementation "org.eclipse.platform:org.eclipse.core.filesystem:${VER_ECLISPE_EFS}"
// Required by org.eclipse.wst.xsd.core
compile "org.eclipse.xsd:org.eclipse.xsd:${VER_ECLISPE_XSD}"
implementation "org.eclipse.xsd:org.eclipse.xsd:${VER_ECLISPE_XSD}"

testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
}
Expand Down
2 changes: 1 addition & 1 deletion _ext/gradle/p2-fat-jar-setup.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ dependencies {
embeddedJars "p2:${groupArtifact}:${version}"
}
// Includes the classes from P2 JARs during compilation
compile files(embeddedClassesDir)
implementation files(embeddedClassesDir)
}

jar {
Expand Down

0 comments on commit e542220

Please sign in to comment.