no longer download support repos

Author: codeanticode

mode/src/processing/mode/android/AndroidSDK.java

@@ -66,8 +66,8 @@ class AndroidSDK {
   private final File buildTools;
   private final File avdManager;
   private final File sdkManager;
-  private final File wearablePath;
-  private final File supportLibPath;
+//  private final File wearablePath;
+//  private final File supportLibPath;
 
   private static final String SDK_DOWNLOAD_URL = 
       "https://developer.android.com/studio/index.html#downloads";
@@ -237,15 +237,15 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
                                 AndroidBuild.TARGET_SDK + " is missing from " + targetPlatform.getAbsolutePath());
     }
 
-    wearablePath = new File(folder, "extras/google/m2repository/com/google/android/support/wearable");
-    if (!wearablePath.exists()) {
-      throw new BadSDKException("There is no wearable folder in " + folder);
-    }
-    
-    supportLibPath = new File(folder, "extras/android/m2repository/com/android/support");
-    if (!supportLibPath.exists()) {
-      throw new BadSDKException("There is no support library folder in " + folder);
-    }
+//    wearablePath = new File(folder, "extras/google/m2repository/com/google/android/support/wearable");
+//    if (!wearablePath.exists()) {
+//      throw new BadSDKException("There is no wearable folder in " + folder);
+//    }
+//    
+//    supportLibPath = new File(folder, "extras/android/m2repository/com/android/support");
+//    if (!supportLibPath.exists()) {
+//      throw new BadSDKException("There is no support library folder in " + folder);
+//    }
 
     avdManager = findCliTool(new File(tools, "bin"), "avdmanager");
     sdkManager = findCliTool(new File(tools, "bin"), "sdkmanager");
@@ -356,14 +356,14 @@ public File getPlatformToolsFolder() {
   }
 
 
-  public File getWearableFolder() {
-    return wearablePath;
-  }
+//  public File getWearableFolder() {
+//    return wearablePath;
+//  }
 
 
-  public File getSupportLibrary() {
-    return supportLibPath;
-  } 
+//  public File getSupportLibrary() {
+//    return supportLibPath;
+//  } 
 
 
   public File getZipAlignTool() {    

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

@@ -84,8 +84,10 @@ class SDKUrlHolder {
     public String platformVersion, buildToolsVersion;
     public String platformToolsUrl, buildToolsUrl, platformUrl, toolsUrl, emulatorUrl;
     public String platformToolsFilename, buildToolsFilename, platformFilename, toolsFilename, emulatorFilename;
-    public String supportRepoUrl, googleRepoUrl, usbDriverUrl;
-    public String supportRepoFilename, googleRepoFilename, usbDriverFilename;
+//    public String supportRepoUrl, googleRepoUrl;
+//    public String supportRepoFilename, googleRepoFilename;
+    public String usbDriverUrl;
+    public String usbDriverFilename;
     public String haxmFilename, haxmUrl;
     public int totalSize = 0;
   }
@@ -114,10 +116,10 @@ protected Object doInBackground() throws Exception {
       if (!extrasFolder.exists()) extrasFolder.mkdir();
       File googleRepoFolder = new File(extrasFolder, "google");
       if (!googleRepoFolder.exists()) googleRepoFolder.mkdir();   
+//    File androidRepoFolder = new File(extrasFolder, "android");
+//    if (!androidRepoFolder.exists()) androidRepoFolder.mkdir();  
       File haxmFolder = new File(extrasFolder, "intel/HAXM");
       if (!haxmFolder.exists()) haxmFolder.mkdirs();      
-      File androidRepoFolder = new File(extrasFolder, "android");
-      if (!androidRepoFolder.exists()) androidRepoFolder.mkdir();      
 
       // creating temp folder for downloaded zip packages
       File tempFolder = new File(androidFolder, "temp");
@@ -154,12 +156,12 @@ protected Object doInBackground() throws Exception {
         downloadAndUnpack(downloadUrls.emulatorUrl, downloadedEmulator, sdkFolder, true);
 
         // google repository
-        File downloadedGoogleRepo = new File(tempFolder, downloadUrls.googleRepoFilename);
-        downloadAndUnpack(downloadUrls.googleRepoUrl, downloadedGoogleRepo, googleRepoFolder, false);
+//        File downloadedGoogleRepo = new File(tempFolder, downloadUrls.googleRepoFilename);
+//        downloadAndUnpack(downloadUrls.googleRepoUrl, downloadedGoogleRepo, googleRepoFolder, false);
 
         // android repository
-        File downloadedSupportRepo = new File(tempFolder, downloadUrls.supportRepoFilename);
-        downloadAndUnpack(downloadUrls.supportRepoUrl, downloadedSupportRepo, androidRepoFolder, false);
+//        File downloadedSupportRepo = new File(tempFolder, downloadUrls.supportRepoFilename);
+//        downloadAndUnpack(downloadUrls.supportRepoUrl, downloadedSupportRepo, androidRepoFolder, false);
 
         // usb driver
         if (Platform.isWindows()) {
@@ -511,16 +513,16 @@ private void parseAndSet(SDKUrlHolder urlHolder, NodeList remotePackages, String
           urlHolder.platformToolsUrl = REPOSITORY_URL + urlHolder.platformToolsFilename;
           urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
           break;
-        case ANDROID_REPO:
-          urlHolder.supportRepoFilename = url.item(0).getTextContent();
-          urlHolder.supportRepoUrl = REPOSITORY_URL + urlHolder.supportRepoFilename;
-          urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
-          break;
-        case GOOGLE_REPO:
-          urlHolder.googleRepoFilename = url.item(0).getTextContent();
-          urlHolder.googleRepoUrl = REPOSITORY_URL + urlHolder.googleRepoFilename;
-          urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
-          break;
+//        case ANDROID_REPO:
+//          urlHolder.supportRepoFilename = url.item(0).getTextContent();
+//          urlHolder.supportRepoUrl = REPOSITORY_URL + urlHolder.supportRepoFilename;
+//          urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
+//          break;
+//        case GOOGLE_REPO:
+//          urlHolder.googleRepoFilename = url.item(0).getTextContent();
+//          urlHolder.googleRepoUrl = REPOSITORY_URL + urlHolder.googleRepoFilename;
+//          urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
+//          break;
         case USB_DRIVER:
           urlHolder.usbDriverFilename = url.item(0).getTextContent();
           urlHolder.usbDriverUrl = REPOSITORY_URL + urlHolder.usbDriverFilename;