Skip to content

Commit acfdb7f

Browse files
committed
Added 'java-library' plugin and removed all deprecated configurations.
1 parent 75ead09 commit acfdb7f

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,25 @@ apply from: 干.file('spotless/freshmark.gradle')
1313

1414
subprojects { subProject ->
1515
apply from: 干.file('base/java8.gradle')
16+
apply plugin: 'java-library'
1617

1718
if (subProject.name == 'durian-swt') {
1819
// configured there
1920
} else if (subProject.name == 'durian-swt.os') {
2021
dependencies {
2122
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
22-
testCompile "junit:junit:$VER_JUNIT"
23+
testImplementation "junit:junit:$VER_JUNIT"
2324
}
2425
} else {
2526
apply plugin: 'com.diffplug.gradle.eclipse.mavencentral'
2627
String platformCode = project.name.substring('durian-swt.'.length())
2728
eclipseMavenCentral {
2829
release SWT_VERSION, {
29-
compile "org.eclipse.swt.$platformCode"
30+
implementation "org.eclipse.swt.$platformCode"
3031
}
3132
}
3233
dependencies {
33-
compile project(':durian-swt')
34+
api project(':durian-swt')
3435
}
3536
configurations.all {
3637
resolutionStrategy.eachDependency { DependencyResolveDetails details ->

durian-swt/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
apply plugin: 'com.diffplug.gradle.eclipse.mavencentral'
22
eclipseMavenCentral { release SWT_VERSION, {
3-
compile 'org.eclipse.swt'
4-
compile 'org.eclipse.jface'
3+
api 'org.eclipse.swt'
4+
api 'org.eclipse.jface'
55
useNativesForRunningPlatform()
66
} }
77
dependencies {
8-
compile project(':durian-swt.os')
9-
compile "com.diffplug.durian:durian-core:$VER_DURIAN"
10-
compile "com.diffplug.durian:durian-collect:$VER_DURIAN"
11-
compile "com.diffplug.durian:durian-concurrent:$VER_DURIAN"
12-
compile "com.diffplug.durian:durian-rx:$VER_DURIAN_RX"
13-
compile "io.reactivex.rxjava2:rxjava:$VER_RXJAVA"
8+
api project(':durian-swt.os')
9+
api "com.diffplug.durian:durian-rx:$VER_DURIAN_RX"
10+
api "io.reactivex.rxjava2:rxjava:$VER_RXJAVA"
11+
implementation "com.diffplug.durian:durian-core:$VER_DURIAN"
12+
implementation "com.diffplug.durian:durian-collect:$VER_DURIAN"
13+
implementation "com.diffplug.durian:durian-concurrent:$VER_DURIAN"
1414
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
1515
compileOnly 'com.google.code.findbugs:annotations:3.0.1'
1616

17-
testCompile "junit:junit:$VER_JUNIT"
18-
testCompile "org.assertj:assertj-core:$VER_ASSERTJ"
19-
testCompile "com.diffplug.durian:durian-debug:$VER_DURIAN_DEBUG"
17+
testImplementation "junit:junit:$VER_JUNIT"
18+
testImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
19+
testImplementation "com.diffplug.durian:durian-debug:$VER_DURIAN_DEBUG"
2020
}
2121

2222
/////////////////////////

0 commit comments

Comments
 (0)