Skip to content

Commit bd2ce1e

Browse files
authored
Merge pull request #359 from rupak0577/sdkmanager
New SDK downloader and updater
2 parents 1b9f9ba + f3ba562 commit bd2ce1e

12 files changed

+623
-176
lines changed

.classpath

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@
66
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
77
<classpathentry combineaccessrules="false" kind="src" path="/processing-java"/>
88
<classpathentry kind="lib" path="mode/gradle-tooling-api-4.0.jar"/>
9+
<classpathentry kind="lib" path="mode/common-25.3.2.jar"/>
10+
<classpathentry kind="lib" path="mode/guava-18.0.jar"/>
11+
<classpathentry kind="lib" path="mode/repository-25.3.2.jar"/>
12+
<classpathentry kind="lib" path="mode/sdklib-25.3.2.jar"/>
913
<classpathentry kind="output" path="core/bin"/>
1014
</classpath>

build.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@
3737
${processing.dir}/java/mode/JavaMode.jar;
3838
${processing.dir}/java/mode/org.eclipse.core.runtime.jar;
3939
${processing.dir}/app/pde.jar;
40-
mode/gradle-tooling-api-4.0.jar"
40+
mode/gradle-tooling-api-4.0.jar;
41+
mode/common-25.3.2.jar;
42+
mode/guava-18.0.jar;
43+
mode/httpcore-4.1.jar;
44+
mode/repository-25.3.2.jar;
45+
mode/sdklib-25.3.2.jar;
46+
mode/commons-compress-1.8.1.jar"
4147
debug="on">
4248
<src path="src" />
4349
</javac>

mode/common-25.3.2.jar

117 KB
Binary file not shown.

mode/commons-compress-1.8.1.jar

357 KB
Binary file not shown.

mode/guava-18.0.jar

2.15 MB
Binary file not shown.

mode/httpcore-4.1.jar

177 KB
Binary file not shown.

mode/repository-25.3.2.jar

200 KB
Binary file not shown.

mode/sdklib-25.3.2.jar

643 KB
Binary file not shown.

src/processing/mode/android/AndroidEditor.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,7 @@ public void actionPerformed(ActionEvent e) {
342342
item = new JMenuItem("Update SDK");
343343
item.addActionListener(new ActionListener() {
344344
public void actionPerformed(ActionEvent e) {
345-
File file = androidMode.getSDK().getAndroidTool();
346-
try {
347-
Runtime.getRuntime().exec(new String[] { file.getAbsolutePath(), "sdk" });
348-
} catch (IOException e1) {
349-
e1.printStackTrace();
350-
}
345+
new SDKUpdater(AndroidEditor.this, androidMode);
351346
}
352347
});
353348
menu.add(item);

src/processing/mode/android/AndroidSDK.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ protected void checkDebugCertificate() {
242242
}
243243

244244

245-
public File getAndroidTool() {
246-
return androidTool;
245+
public File getToolsFolder() {
246+
return tools;
247247
}
248248

249249

0 commit comments

Comments
 (0)