more env var renaming

Author: codeanticode

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {        
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath group: 'commons-io', name: 'commons-io', version: '2.8.0'
         classpath group: 'org.zeroturnaround', name: 'zt-zip', version: '1.14'
     }
@@ -38,7 +38,7 @@ allprojects {
     ext.processingVersion = versions.getProperty("org.processing")
     ext.toolingVersion = versions.getProperty("org.gradle%gradle-tooling-api")
     ext.slf4jVersion = versions.getProperty("org.slf4j")
-    ext.gradlewVersion = versions.getProperty("gradlew")
+    ext.gradlewVersion = versions.getProperty("gradle-wrapper")
     ext.toolsLibVersion = versions.getProperty("android-toolslib")
     ext.jdtVersion = versions.getProperty("org.eclipse.jdt")
 

mode/build.gradle

@@ -61,6 +61,7 @@ task permissions(type:Exec) {
 task wrapper(type: Wrapper) {
    gradleVersion = "${gradlewVersion}" // version required for gradle wrapper
 }
+
 wrapper.doLast {
   File wrapperFolder = file("mode/gradlew");
   wrapperFolder.mkdirs();
@@ -70,8 +71,7 @@ wrapper.doLast {
   FileUtils.copyDirectory(file("gradle"), file("../debug/gradle"))
   delete "gradle"
   ZipUtil.pack(file("mode/gradlew"), new File("mode/mode/gradlew.zip"));    
-  delete "mode/gradlew"
-    
+  delete "mode/gradlew"    
 }
 
 clean.doFirst {

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

@@ -63,7 +63,7 @@ class AndroidBuild extends JavaBuild {
   // Versions of all required dependencies
   static public String TARGET_SDK;  
   static public String TARGET_PLATFORM;
-  static public String GRADLE_VER;
+  static public String GRADLE_PLUGIN_VER;
   static public String APPCOMPAT_VER;
   static public String V4LEGACY_VER;
   static public String PLAY_SERVICES_VER;
@@ -293,7 +293,7 @@ private void createTopModule(String projectModules)
 
     File buildTemplate = mode.getContentFile("templates/" + TOP_GRADLE_BUILD_TEMPLATE);
     File buildlFile = new File(tmpFolder, "build.gradle");
-    replaceMap.put("@@gradle_version@@", GRADLE_VER);
+    replaceMap.put("@@gradle_plugin_version@@", GRADLE_PLUGIN_VER);
     AndroidUtil.createFileFromTemplate(buildTemplate, buildlFile, replaceMap);
 
     File gradlePropsTemplate = mode.getContentFile("templates/" + GRADLE_PROPERTIES_TEMPLATE);
@@ -913,11 +913,11 @@ static public void initVersions(File file) {
       // Versions strings of all dependencies are stored in a preferences file so they can be changed by the 
       // user without having to rebuild/reinstall the mode.
 
-      GRADLE_VER = Preferences.get("android.gradle");
-      String defGradleVersion = props.getProperty("gradle");
-      if (GRADLE_VER == null || PApplet.parseInt(GRADLE_VER) != PApplet.parseInt(defGradleVersion)) {
-        GRADLE_VER = defGradleVersion;
-        Preferences.set("android.gradle", GRADLE_VER);
+      GRADLE_PLUGIN_VER = Preferences.get("android.gradle_plugin");
+      String defGradlePluginVersion = props.getProperty("android-gradle-plugin");
+      if (GRADLE_PLUGIN_VER == null || PApplet.parseInt(GRADLE_PLUGIN_VER) != PApplet.parseInt(defGradlePluginVersion)) {
+        GRADLE_PLUGIN_VER = defGradlePluginVersion;
+        Preferences.set("android.gradle_plugin", GRADLE_PLUGIN_VER);
       }
 
       TARGET_SDK = Preferences.get("android.sdk.target");