Include all required deps by updated and lang support

Author: codeanticode

mode/languages/mode.properties

@@ -209,8 +209,6 @@ android_devices.error.no_permissions_body = Make sure that the device has USB de
 	"";
 
   private static final String DEVICE_PERMISSIONS_MESSAGE =
-    
-
 
 # ---------------------------------------
 # Keystore manager
@@ -283,3 +281,27 @@ download_property.change_event_total = total
 download_property.change_event_downloaded = downloaded
 download_prompt.cancel = Cancel download
 
+# ---------------------------------------
+# SDK Updater tool
+
+sdk_updater.name_column = Package name
+sdk_updater.version_column = Installed version
+sdk_updater.available_column = Available update
+
+sdk_updater.query_message = Querying packages...
+
+sdk_updater.no_updates_message = No updates available
+sdk_updater.one_updates_message = 1 update found!
+sdk_updater.many_updates_message = "%d" updates found!
+
+sdk_updater.warning_failed_finding_package = Failed to find package "%s"
+sdk_updater.warning_failed_computing_dependency_list = Unable to compute a complete list of dependencies.
+
+sdk_updater.refresh_package_message = Refreshing packages...
+sdk_updater.download_package_message = Downloading available updates...
+sdk_updater.download_canceled_message = Download canceled
+
+sdk_updater.update_button_label = Update
+sdk_updater.cancel_button_label = Cancel
+sdk_updater.close_button_label = Close
+

mode/src/processing/mode/android/SDKDownloader.java

@@ -296,7 +296,7 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
 
           NodeList channel = ((Element) childNodes).getElementsByTagName("channelRef");
           if(!channel.item(0).getAttributes().item(0).getNodeValue().equals("channel-0"))
-            continue; //Stable channel only, skip others
+            continue; // Stable channel only, skip others
 
           NodeList revision = ((Element) childNodes).getElementsByTagName("revision");
           String major = (((Element) revision.item(0)).getElementsByTagName("major")).item(0).getTextContent();
@@ -333,7 +333,6 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
 
       // -----------------------------------------------------------------------
       // Command-line tools
-//      expr = xpath.compile("//remotePackage[@path=\"cmdline-tools;\"]");
       expr = xpath.compile("//remotePackage[starts-with(@path, \"cmdline-tools;\")]");      
       remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
       found = false;

mode/tools/SDKUpdater/build.gradle

@@ -8,17 +8,28 @@ configurations {
 dependencies {
     compile group: "org.processing", name: "pde", version: "${processingVersion}"
 
+    compile group: "org.processing", name: "java-mode", version: "${processingVersion}"
+    compile fileTree(include: ["AndroidMode.jar"], dir: '../../mode')
+
     compileAndCopy group: "com.android.tools", name: "sdklib", version: "${toolsLibVersion}"
     compileAndCopy group: "com.android.tools", name: "repository", version: "${toolsLibVersion}"
 }
 
 // This task copies the gradle tooling jar into the mode folder
 task copyToLib(type: Copy) {
   from configurations.compileAndCopy.files {
-    include '**/sdklib*'
-    include '**/repository*'
+    include '**/annotations-*'
+    include '**/common-*'
+    include '**/dvlib-*'
+    include '**/gson-*'
+    include '**/guava-*'
+    include '**/httpcore-*'
+    include '**/kotlin-stdlib-*'
+    include '**/layoutlib-api-*'
+    include '**/repository-*'
+    include '**/sdklib-*'
   }
-  into "lib"
+  into "tool"
 }
 build.dependsOn(copyToLib)
 
@@ -32,7 +43,6 @@ sourceSets {
 
 clean.doFirst {
     delete "tool"
-    delete "lib"
 }
 
 build.doLast {

mode/tools/SDKUpdater/src/processing/mode/android/tools/SDKUpdater.java

@@ -35,6 +35,7 @@
 import processing.app.Preferences;
 import processing.app.tools.Tool;
 import processing.app.ui.Toolkit;
+import processing.mode.android.AndroidMode;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -69,7 +70,9 @@ public class SDKUpdater extends JFrame implements PropertyChangeListener, Tool {
   final static private int BUTTON_HEIGHT = Toolkit.zoom(25);
 
   private final Vector<String> columns = new Vector<>(Arrays.asList(
-      "Package name", "Installed version", "Available update"));
+      AndroidMode.getTextString("sdk_updater.name_column"), 
+      AndroidMode.getTextString("sdk_updater.version_column"),
+      AndroidMode.getTextString("sdk_updater.available_column")));
   private static final String PROPERTY_CHANGE_QUERY = "query";
 
   private File sdkFolder;
@@ -102,13 +105,13 @@ public void run() {
     queryTask = new QueryTask();
     queryTask.addPropertyChangeListener(this);
     queryTask.execute();
-    status.setText("Querying packages...");    
+    status.setText(AndroidMode.getTextString("sdk_updater.query_message"));    
   }
-
+  
 
   @Override
-  public String getMenuTitle() {   
-    return "menu.android.sdk_updater";
+  public String getMenuTitle() {    
+    return AndroidMode.getTextString("menu.android.sdk_updater");
   }
 
 
@@ -119,13 +122,13 @@ public void propertyChange(PropertyChangeEvent evt) {
       progressBar.setIndeterminate(false);
       if (numUpdates == 0) {
         actionButton.setEnabled(false);
-        status.setText("No updates available");
+        status.setText(AndroidMode.getTextString("sdk_updater.no_updates_message"));
       } else {
         actionButton.setEnabled(true);
         if (numUpdates == 1) {
-          status.setText("1 update found!");
+          status.setText(AndroidMode.getTextString("sdk_updater.one_updates_message"));
         } else { 
-          status.setText(numUpdates + " updates found!");                    
+          status.setText(AndroidMode.getTextString("sdk_updater.many_updates_message", numUpdates));
         }                    
       }
       break;
@@ -277,7 +280,7 @@ protected Object doInBackground() throws Exception {
       for (String path : settings.getPaths(mRepoManager)) {
         RemotePackage p = mRepoManager.getPackages().getRemotePackages().get(path);
         if (p == null) {
-          progress.logWarning("Failed to find package " + path);
+          progress.logWarning(AndroidMode.getTextString("sdk_updater.warning_failed_finding_package", path));
           throw new SdkManagerCli.CommandFailedException();
         }
         remotes.add(p);
@@ -294,7 +297,7 @@ protected Object doInBackground() throws Exception {
           }
         }
       } else {
-        progress.logWarning("Unable to compute a complete list of dependencies.");
+        progress.logWarning(AndroidMode.getTextString("sdk_updater.warning_failed_computing_dependency_list"));
         throw new SdkManagerCli.CommandFailedException();
       }
 
@@ -308,7 +311,7 @@ protected void done() {
       try {
         get();
         actionButton.setEnabled(false);
-        status.setText("Refreshing packages...");
+        status.setText(AndroidMode.getTextString("sdk_updater.refresh_package_message"));
         queryTask = new QueryTask();
         queryTask.addPropertyChangeListener(SDKUpdater.this);
         queryTask.execute();
@@ -457,8 +460,8 @@ public void actionPerformed(ActionEvent e) {
 //          };
 //          update.start();    
 
-          status.setText("Downloading available updates...");
-          actionButton.setText("Cancel");
+          status.setText(AndroidMode.getTextString("sdk_updater.download_package_message"));
+          actionButton.setText(AndroidMode.getTextString("sdk_updater.cancel_button_label"));
         }
       }
     });
@@ -481,7 +484,7 @@ public void actionPerformed(ActionEvent actionEvent) {
       }
     };
 
-    JButton closeButton = new JButton("Close");
+    JButton closeButton = new JButton(AndroidMode.getTextString("sdk_updater.close_button_label"));
     closeButton.setPreferredSize(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT));
     closeButton.addActionListener(disposer);
     closeButton.setEnabled(true);
@@ -520,10 +523,10 @@ public void cancelTasks() {
     queryTask.cancel(true);
     if (downloadTaskRunning) {
       downloadTask.cancel(true);
-      status.setText("Download canceled");
+      status.setText(AndroidMode.getTextString("sdk_updater.download_canceled_message"));
       JOptionPane.showMessageDialog(null,
-          "Download canceled", "Warning", JOptionPane.WARNING_MESSAGE);
-      actionButton.setText("Update");
+          AndroidMode.getTextString("sdk_updater.download_canceled_message"), "Warning", JOptionPane.WARNING_MESSAGE);
+      actionButton.setText(AndroidMode.getTextString("sdk_updater.update_button_label"));
     }
   }
 

settings.gradle

@@ -1,2 +1,2 @@
-include ':core', ':mode:libraries:vr', ':mode:libraries:ar', 'mode:tools:SDKUpdater', ':mode'
+include ':core', ':mode', ':mode:libraries:vr', ':mode:libraries:ar', 'mode:tools:SDKUpdater'