Skip to content

Commit 5185e09

Browse files
committed
Fix compile / implementation stuff for Gradle 6+
1 parent e2ef4c3 commit 5185e09

File tree

12 files changed

+38
-30
lines changed

12 files changed

+38
-30
lines changed

build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ buildscript {
2525
repositories {
2626
mavenCentral()
2727
}
28+
29+
apply from: rootProject.file('gradle/spotless/spotless.gradle')
2830
subprojects {
31+
apply from: rootProject.file('gradle/spotless/spotless.gradle')
2932
repositories {
3033
mavenCentral()
3134
// SNAPSHOT versions are free to rely on other SNAPSHOT libraries
@@ -73,8 +76,8 @@ configure(subprojects.findAll(IS_PLUGIN)) {
7376

7477
// add SWT and the appropriate platform-native SWT for building and testing
7578
dependencies {
76-
compile "eclipse-deps:org.eclipse.swt:+"
77-
compile "eclipse-deps:org.eclipse.swt.${com.diffplug.common.swt.os.SwtPlatform.getNative()}:+"
79+
implementation "eclipse-deps:org.eclipse.swt:+"
80+
implementation "eclipse-deps:org.eclipse.swt.${com.diffplug.common.swt.os.SwtPlatform.getNative()}:+"
7881
}
7982

8083
//////////
@@ -130,11 +133,6 @@ configure(subprojects.findAll(IS_PLUGIN)) {
130133
tasks.eclipse.dependsOn(cleanEclipse)
131134
}
132135

133-
// formatting
134-
allprojects {
135-
apply from: rootProject.file('gradle/spotless/spotless.gradle')
136-
}
137-
138136
/////////////////////////////////////////////////////////
139137
// Root eclipse project for tinkering with build files //
140138
/////////////////////////////////////////////////////////

com.diffplug.needs17/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Bundle-Vendor: DiffPlug
77
Bundle-Version: 1.0.0
88
Export-Package: needs17;version="1.0.0"
99
Import-Package: com.google.common.base;version="[17.0,18)"
10+

com.diffplug.needs17/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile "com.google.guava:guava:17.0"
2+
implementation "com.google.guava:guava:17.0"
33
}
44
jar.manifest.attributes('-exportcontents': 'needs17')

com.diffplug.needs18/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Bundle-Vendor: DiffPlug
77
Bundle-Version: 1.0.0
88
Export-Package: needs18;version="1.0.0"
99
Import-Package: com.google.common.util.concurrent;version="[18.0,19)"
10+

com.diffplug.needs18/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile "com.google.guava:guava:18.0"
2+
implementation "com.google.guava:guava:18.0"
33
}
44
jar.manifest.attributes('-exportcontents': 'needs18')

com.diffplug.needsBoth/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Bundle-Vendor: DiffPlug
77
Bundle-Version: 1.0.0
88
Export-Package: needsboth;version="1.0.0"
99
Import-Package: needs17;version="[1.0,2)",needs18;version="[1.0,2)"
10+
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':com.diffplug.needs17')
3-
compile project(':com.diffplug.needs18')
2+
implementation project(':com.diffplug.needs17')
3+
implementation project(':com.diffplug.needs18')
44
}
55
jar.manifest.attributes('-exportcontents': 'needsboth')

com.diffplug.rcpdemo/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ Import-Package: com.diffplug.common.base;version="[1.2,2)",com.diffplu
1212
ion="[1.0,2)",com.google.common.collect;version="[18.0,19)",needsboth
1313
;version="[1.0,2)",org.eclipse.equinox.app;version="[1.1,2)",org.ecli
1414
pse.swt.graphics,org.eclipse.swt.widgets
15+

com.diffplug.rcpdemo/build.gradle

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,27 @@ def runtimeDeps = [
1414
]
1515

1616
dependencies {
17-
compile project(':com.diffplug.needsBoth')
18-
compile project(':com.diffplug.talks.rxjava_and_swt')
17+
implementation project(':com.diffplug.needsBoth')
18+
implementation project(':com.diffplug.talks.rxjava_and_swt')
1919

20-
compile "eclipse-deps:com.ibm.icu:+"
21-
compile "eclipse-deps:org.eclipse.osgi:+"
22-
compile "eclipse-deps:org.eclipse.equinox.app:+"
23-
compile "eclipse-deps:org.eclipse.equinox.common:+"
24-
compile "eclipse-deps:org.eclipse.core.runtime:+"
20+
implementation "eclipse-deps:com.ibm.icu:+"
21+
implementation "eclipse-deps:org.eclipse.osgi:+"
22+
implementation "eclipse-deps:org.eclipse.equinox.app:+"
23+
implementation "eclipse-deps:org.eclipse.equinox.common:+"
24+
implementation "eclipse-deps:org.eclipse.core.runtime:+"
2525

26-
compile "eclipse-deps:org.eclipse.swt:+"
27-
compile "eclipse-deps:org.eclipse.jface:+"
26+
implementation "eclipse-deps:org.eclipse.swt:+"
27+
implementation "eclipse-deps:org.eclipse.jface:+"
2828

29-
compile "com.diffplug.durian:durian-swt:${VER_DURIAN_SWT}"
29+
implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
30+
implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
31+
implementation "com.diffplug.durian:durian-swt:${VER_DURIAN_SWT}"
32+
implementation "com.google.guava:guava:17.0"
33+
testImplementation "junit:junit:${VER_JUNIT}"
3034

31-
testCompile "junit:junit:${VER_JUNIT}"
32-
33-
runtime 'com.diffplug.osgi:com.diffplug.osgi.extension.sun.misc:0.0.0'
35+
runtimeOnly 'com.diffplug.osgi:com.diffplug.osgi.extension.sun.misc:0.0.0'
3436
runtimeDeps.each {
35-
runtime "eclipse-deps:${it}:+"
37+
runtimeOnly "eclipse-deps:${it}:+"
3638
}
3739
}
3840
jar.manifest.attributes('Bundle-SymbolicName': project.name + ';singleton:=true')

com.diffplug.talks.rxjava_and_swt/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ Import-Package: com.diffplug.common.base;version="[1.2,2)",com.diffplu
1313
.0,3)",com.diffplug.common.swt;version="[2.0,3)",com.diffplug.common.
1414
tree;version="[1.2,2)",org.eclipse.swt.graphics,org.eclipse.swt.widge
1515
ts,rx;version="[1.1,2)",rx.functions;version="[1.1,2)"
16+

0 commit comments

Comments
 (0)