Skip to content

Commit ea93b61

Browse files
codeanticodecodeanticode
committed
remove use of compile configuration
1 parent 5cc0c57 commit ea93b61

3 files changed

Lines changed: 25 additions & 22 deletions

File tree

‎build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,11 @@ task dist {
121121
FileUtils.copyDirectory(file("mode/languages"),
122122
file("${root}/languages"))
123123

124-
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"),
124+
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"),
125125
file("${root}/tools/SDKUpdater/tool"))
126-
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/src"),
126+
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/lib"),
127+
file("${root}/tools/SDKUpdater/lib"))
128+
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/src"),
127129
file("${root}/tools/SDKUpdater/src"))
128130

129131
FileUtils.copyDirectory(file("mode/libraries/vr/examples"),

‎mode/build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
66
// Extend compile to copy the jars from gradle-tooling and slf4j:
77
// https://stackoverflow.com/a/43602463
88
configurations {
9-
compile.extendsFrom compileAndCopy
10-
compile.extendsFrom compileAndExtract
9+
implementation.extendsFrom implementationCopy
10+
implementation.extendsFrom implementationExtract
1111
}
1212

1313
dependencies {
14-
compile group: "org.processing", name: "core", version: "${processingVersion}"
15-
compile group: "org.processing", name: "pde", version: "${processingVersion}"
16-
compile group: "org.processing", name: "java-mode", version: "${processingVersion}"
14+
implementation group: "org.processing", name: "core", version: "${processingVersion}"
15+
implementation group: "org.processing", name: "pde", version: "${processingVersion}"
16+
implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
1717

18-
compileAndExtract "org.eclipse.jdt:org.eclipse.jdt.debug:${jdtVersion}"
18+
implementationExtract "org.eclipse.jdt:org.eclipse.jdt.debug:${jdtVersion}"
1919

20-
compileAndCopy "org.gradle:gradle-tooling-api:${toolingVersion}"
21-
compileAndCopy "org.slf4j:slf4j-api:${slf4jVersion}"
22-
compileAndCopy "org.slf4j:slf4j-simple:${slf4jVersion}"
20+
implementationCopy "org.gradle:gradle-tooling-api:${toolingVersion}"
21+
implementationCopy "org.slf4j:slf4j-api:${slf4jVersion}"
22+
implementationCopy "org.slf4j:slf4j-simple:${slf4jVersion}"
2323

24-
compile fileTree(include: ["jdi.jar", "jdimodel.jar"], dir: 'mode')
24+
implementation fileTree(include: ["jdi.jar", "jdimodel.jar"], dir: 'mode')
2525
}
2626

2727
// This task copies the gradle tooling jar into the mode folder
2828
task copyToLib(type: Copy) {
29-
from configurations.compileAndCopy.files
29+
from configurations.implementationCopy.files
3030
into "mode"
3131
}
3232
build.dependsOn(copyToLib)
@@ -42,7 +42,7 @@ sourceSets {
4242
task getjdi(type: Copy) {
4343
// This task extracts the jar files inside org.eclipse.jdt.debug, which are
4444
// jdi.jar and jdimodel.jar and needed to build the debugger.
45-
from(zipTree(configurations.compileAndExtract.files[0])) {
45+
from(zipTree(configurations.implementationExtract.files[0])) {
4646
include '**/*.jar'
4747
exclude 'META-INF'
4848
}

‎mode/tools/SDKUpdater/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ import java.nio.file.Files
22
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
33

44
configurations {
5-
compile.extendsFrom compileAndCopy
5+
implementation.extendsFrom implementationCopy
66
}
77

88
dependencies {
9-
compile group: "org.processing", name: "pde", version: "${processingVersion}"
9+
implementation group: "org.processing", name: "pde", version: "${processingVersion}"
1010

11-
compile group: "org.processing", name: "java-mode", version: "${processingVersion}"
12-
compile fileTree(include: ["AndroidMode.jar"], dir: '../../mode')
11+
implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
12+
implementation fileTree(include: ["AndroidMode.jar"], dir: '../../mode')
1313

14-
compileAndCopy group: "com.android.tools", name: "sdklib", version: "${toolsLibVersion}"
15-
compileAndCopy group: "com.android.tools", name: "repository", version: "${toolsLibVersion}"
14+
implementationCopy group: "com.android.tools", name: "sdklib", version: "${toolsLibVersion}"
15+
implementationCopy group: "com.android.tools", name: "repository", version: "${toolsLibVersion}"
1616
}
1717

1818
// This task copies the gradle tooling jar into the mode folder
1919
task copyToLib(type: Copy) {
20-
from configurations.compileAndCopy.files {
20+
from configurations.implementationCopy.files {
2121
include '**/annotations-*'
2222
include '**/common-*'
2323
include '**/dvlib-*'
@@ -29,7 +29,7 @@ task copyToLib(type: Copy) {
2929
include '**/repository-*'
3030
include '**/sdklib-*'
3131
}
32-
into "tool"
32+
into "lib"
3333
}
3434
build.dependsOn(copyToLib)
3535

@@ -43,6 +43,7 @@ sourceSets {
4343

4444
clean.doFirst {
4545
delete "tool"
46+
delete "lib"
4647
}
4748

4849
build.doLast {

0 commit comments

Comments
 (0)