fixed sketch templates and build classpath

Author: codeanticode

mode/src/processing/mode/android/AndroidBuild.java

@@ -338,11 +338,14 @@ private void createAppModule(String moduleName)
       tmplFile = exportProject ? APP_GRADLE_BUILD_TEMPLATE : APP_GRADLE_BUILD_ECJ_TEMPLATE;
     }
 
+    String tls = Base.getToolsFolder().getPath().replace('\\', '/');
+    String plt = sdk.getTargetPlatform(TARGET_SDK).getPath().replace('\\', '/');
+    
     File appBuildTemplate = mode.getContentFile("templates/" + tmplFile);    
     File appBuildFile = new File(moduleFolder, "build.gradle");    
     HashMap<String, String> replaceMap = new HashMap<String, String>();
-    replaceMap.put("@@tools_folder@@", Base.getToolsFolder().getPath().replace('\\', '/'));
-    replaceMap.put("@@target_platform@@", TARGET_SDK);
+    replaceMap.put("@@tools_folder@@", tls);
+    replaceMap.put("@@target_platform@@", plt);
     replaceMap.put("@@package_name@@", getPackageName());    
     replaceMap.put("@@min_sdk@@", minSdk);  
     replaceMap.put("@@target_sdk@@", TARGET_SDK);

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

@@ -99,7 +99,7 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
       throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_sdk_folder", folder));
     }
 
-    cmdlineTools = new File(folder, "cmdline-tools/latest");
+    cmdlineTools = new File(folder, "cmdline-tools");
     if (!cmdlineTools.exists()) {
       throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_tools_folder", folder));
     }
@@ -262,6 +262,10 @@ public File getHighestPlatform() {
     return highestPlatform;
   }
 
+  public File getTargetPlatform(String target) {
+    return new File(platforms, "android-" + target);
+  }  
+  
 
   public File getZipAlignTool() {    
     File[] files = buildTools.listFiles();
@@ -281,7 +285,13 @@ public File getZipAlignTool() {
   private static final String response = "y\ny\ny\ny\ny\ny\ny\ny\ny\ny\n";
 
   private void acceptLicenses() {
-    ProcessBuilder pb = new ProcessBuilder(sdkManager.getAbsolutePath(), "--licenses");
+    final String[] cmd = new String[] {
+        sdkManager.getAbsolutePath(),
+        "--sdk_root=", folder.getAbsolutePath(),
+        "--licenses"
+    };
+       
+    ProcessBuilder pb = new ProcessBuilder(cmd);
     pb.redirectErrorStream(true);
     try {
       Process process = pb.start();

mode/templates/ARActivity.java.tmpl

@@ -6,13 +6,14 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.content.Intent;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import processing.android.PFragment;
 import processing.android.CompatUtils;
 import processing.core.PApplet;

mode/templates/AppActivity.java.tmpl

@@ -4,7 +4,7 @@ import android.os.Bundle;
 import android.content.Intent;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import processing.android.PFragment;
 import processing.android.CompatUtils;