Skip to content

Commit e992ff0

Browse files
committed
pick highest version of installed build tools
1 parent 855f6b9 commit e992ff0

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/processing/mode/android/AndroidBuild.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,15 +1523,21 @@ protected void createGradleProject(File projectFolder, File exportFolder)
15231523
throws IOException, SketchException {
15241524
installGradlew(exportFolder);
15251525

1526-
1526+
File folder = sdk.getBuildToolsFolder();
1527+
String[] versions = folder.list();
1528+
String[] sorted = PApplet.sort(versions, versions.length);
1529+
String buildToolVer = "";
1530+
if (sorted != null && 0 < sorted.length) {
1531+
buildToolVer = sorted[sorted.length - 1];
1532+
}
15271533

15281534
if (appComponent == WATCHFACE) {
15291535
createTopModule(projectFolder, exportFolder, "':mobile', ':wear'");
1530-
createMobileModule(projectFolder, exportFolder, "24.0.1");
1531-
createWearModule(new File(projectFolder, "wear"), exportFolder, "24.0.1");
1536+
createMobileModule(projectFolder, exportFolder, buildToolVer);
1537+
createWearModule(new File(projectFolder, "wear"), exportFolder, buildToolVer);
15321538
} else {
15331539
createTopModule(projectFolder, exportFolder, "':app'");
1534-
createAppModule(projectFolder, exportFolder, "24.0.1");
1540+
createAppModule(projectFolder, exportFolder, buildToolVer);
15351541
}
15361542
}
15371543

0 commit comments

Comments
 (0)