Skip to content

Commit e151953

Browse files
committed
use local processing jars
1 parent 2c7522b commit e151953

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,12 @@ task dist {
115115
FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))
116116
FileUtils.copyDirectory(file("mode/theme"), file("${root}/theme"))
117117
FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
118+
delete "${root}/mode/core.jar"
119+
delete "${root}/mode/pde.jar"
120+
delete "${root}/mode/JavaMode.jar"
118121
delete "${root}/mode/jdi.jar"
119122
delete "${root}/mode/jdimodel.jar"
120-
123+
121124
Files.copy(file("mode/processing-core.zip").toPath(),
122125
file("${root}/processing-core.zip").toPath(), REPLACE_EXISTING)
123126

mode/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ configurations {
1212
}
1313

1414
dependencies {
15-
implementation group: "org.processing", name: "core", version: "${processingVersion}"
16-
implementation group: "org.processing", name: "pde", version: "${processingVersion}"
17-
implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
15+
// implementation group: "org.processing", name: "core", version: "${processingVersion}"
16+
// implementation group: "org.processing", name: "pde", version: "${processingVersion}"
17+
// implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
1818

1919
implementationExtract "org.eclipse.jdt:org.eclipse.jdt.debug:${jdtVersion}"
2020

2121
implementationCopy "org.gradle:gradle-tooling-api:${toolingVersion}"
2222
implementationCopy "org.slf4j:slf4j-api:${slf4jVersion}"
2323
implementationCopy "org.slf4j:slf4j-simple:${slf4jVersion}"
2424

25-
implementation fileTree(include: ["jdi.jar", "jdimodel.jar"], dir: 'mode')
25+
implementation fileTree(include: ["jdi.jar", "jdimodel.jar", "core.jar", "pde.jar", "JavaMode.jar"], dir: 'mode')
2626
}
2727

2828
// This task copies the gradle tooling jar into the mode folder
@@ -85,6 +85,9 @@ clean.doFirst {
8585
exclude "jaxb-jxc.jar"
8686
exclude "jaxb-runtime.jar"
8787
exclude "jaxb-xjc.jar"
88+
exclude "core.jar"
89+
exclude "pde.jar"
90+
exclude "JavaMode.jar"
8891
}
8992
}
9093

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
org.gradle.jvmargs=-Xmx1536m
2+
android.enableJetifier=true
3+
android.useAndroidX=true

mode/tools/SDKUpdater/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ configurations {
77

88
dependencies {
99
// implementation group: "org.processing", name: "pde", version: "${processingVersion}"
10-
implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
11-
implementation fileTree(include: ["AndroidMode.jar"], dir: '../../mode')
10+
// implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
11+
implementation fileTree(include: ["AndroidMode.jar", "pde.jar", "JavaMode.jar"], dir: '../../mode')
1212

1313
implementationCopy group: "com.android.tools", name: "sdklib", version: "${toolsLibVersion}"
1414
implementationCopy group: "com.android.tools", name: "repository", version: "${toolsLibVersion}"

0 commit comments

Comments
 (0)