updated gradle build scripts for apps and watch faces

codeanticode · codeanticode · commit 6d716cbbf90d · 2018-01-24T22:59:54.000-05:00
diff --git a/src/processing/mode/android/AndroidBuild.java b/src/processing/mode/android/AndroidBuild.java
@@ -74,9 +74,9 @@ class AndroidBuild extends JavaBuild {
   // All of these are hard-coded, as the TARGET_SDK. Should obtained from the
   // repository files? Or users being able to change them in the preferences 
   // file?
-  static public final String SUPPORT_VER       = "25.2.0";
-  static public final String PLAY_SERVICES_VER = "10.2.0";  
-  static public final String WEAR_VER          = "2.0.0";
+  static public final String SUPPORT_VER       = "25.3.1";
+  static public final String PLAY_SERVICES_VER = "11.8.0";  
+  static public final String WEAR_VER          = "2.0.5";
   static public final String GVR_VER           = "1.60.1";  
   
   // Main activity or service 
@@ -179,7 +179,7 @@ public boolean usesOpenGL() {
   
   public String getPathForAPK() {
     String suffix = target.equals("release") ? "release_unsigned" : "debug";
-    String apkName = module + "/build/outputs/apk/" + sketch.getName().toLowerCase() + "_" + suffix + ".apk";
+    String apkName = getPathToAPK() + sketch.getName().toLowerCase() + "_" + suffix + ".apk";
     final File apkFile = new File(tmpFolder, apkName);
     if (!apkFile.exists()) {
       return null;
@@ -233,16 +233,12 @@ protected File createProject(boolean external)
     File folder = sdk.getBuildToolsFolder();
     String[] versions = folder.list();
     String[] sorted = PApplet.sort(versions, versions.length);
-    String buildToolsVer = "";
-    if (sorted != null && 0 < sorted.length) {
-      buildToolsVer = sorted[sorted.length - 1];
-    } 
 
     if (sketchClassName != null) {
       renderer = info.getRenderer();
       writeMainClass(srcFolder, renderer, external);
-      createTopModule(buildToolsVer, "':" + module +"'");
-      createAppModule(buildToolsVer, module);
+      createTopModule("':" + module +"'");
+      createAppModule(module);
     }
     
     return tmpFolder;
@@ -292,7 +288,7 @@ protected boolean gradleBuild() throws SketchException {
   // Gradle modules  
   
   
-  private void createTopModule(String buildToolsVer, String projectModules) 
+  private void createTopModule(String projectModules) 
       throws IOException {
     File buildTemplate = mode.getContentFile("templates/" + TOP_GRADLE_BUILD_TEMPLATE);
     File buildlFile = new File(tmpFolder, "build.gradle");
@@ -310,7 +306,7 @@ private void createTopModule(String buildToolsVer, String projectModules)
   }
   
   
-  private void createAppModule(String buildToolsVer, String moduleName)
+  private void createAppModule(String moduleName)
       throws SketchException, IOException {
     File moduleFolder = AndroidUtil.createPath(tmpFolder, moduleName);
     
@@ -332,7 +328,6 @@ private void createAppModule(String buildToolsVer, String moduleName)
     HashMap<String, String> replaceMap = new HashMap<String, String>();
     replaceMap.put("@@tools_folder@@", Base.getToolsFolder().getPath().replace('\\', '/'));
     replaceMap.put("@@target_platform@@", sdk.getTargetPlatform().getPath().replace('\\', '/'));
-    replaceMap.put("@@build_tools@@", buildToolsVer);    
     replaceMap.put("@@package_name@@", getPackageName());    
     replaceMap.put("@@min_sdk@@", minSdk);  
     replaceMap.put("@@target_sdk@@", TARGET_SDK);
@@ -700,10 +695,6 @@ private void copySupportLibs(File tmpFolder, File libsFolder) throws IOException
     aarFile = new File(sdk.getSupportLibrary(), 
         "/support-vector-drawable/" + SUPPORT_VER + "/support-vector-drawable-" + SUPPORT_VER + ".aar");
     Util.copyFile(aarFile, new File(libsFolder, aarFile.getName()));
-    
-    File compatJarFile = new File(sdk.getSupportLibrary(), 
-        "/support-annotations/" + SUPPORT_VER + "/support-annotations-" + SUPPORT_VER + ".jar");
-    Util.copyFile(compatJarFile, new File(libsFolder, "support-annotations-" + SUPPORT_VER + ".jar"));      
   }
   
   
@@ -758,7 +749,7 @@ public File exportPackage(String keyStorePassword) throws Exception {
 
     // Final export folder
     File exportFolder = createExportFolder("build");
-    Util.copyDir(new File(projectFolder, module + "/build/outputs/apk"), exportFolder);    
+    Util.copyDir(new File(projectFolder, getPathToAPK()), exportFolder);    
     return exportFolder;
   }
 
@@ -768,10 +759,10 @@ private File signPackage(File projectFolder, String keyStorePassword) throws Exc
     if (keyStore == null) return null;
     
     File unsignedPackage = new File(projectFolder, 
-        module + "/build/outputs/apk/" + sketch.getName().toLowerCase() + "_release_unsigned.apk");
+        getPathToAPK() + sketch.getName().toLowerCase() + "_release_unsigned.apk");
     if (!unsignedPackage.exists()) return null;
     File signedPackage = new File(projectFolder, 
-        module + "/build/outputs/apk/" + sketch.getName().toLowerCase() + "_release_signed.apk");
+        getPathToAPK() + sketch.getName().toLowerCase() + "_release_signed.apk");
 
     JarSigner.signJar(unsignedPackage, signedPackage, 
         AndroidKeyStore.ALIAS_STRING, keyStorePassword, 
@@ -793,7 +784,7 @@ private File zipalignPackage(File signedPackage, File projectFolder)
     }
     
     File alignedPackage = new File(projectFolder, 
-        module + "/build/outputs/apk/" + sketch.getName().toLowerCase() + "_release_signed_aligned.apk");
+        getPathToAPK() + sketch.getName().toLowerCase() + "_release_signed_aligned.apk");
 
     String[] args = {
         zipAlign.getAbsolutePath(), "-v", "-f", "4",
@@ -906,18 +897,23 @@ private void copyCodeFolder(final File libsFolder) throws IOException {
 
   private void renameAPK() {
     String suffix = target.equals("release") ? "release-unsigned" : "debug";
-    String apkName = module + "/build/outputs/apk/" + module + "-" + suffix + ".apk";
+    String apkName = getPathToAPK() + module + "-" + suffix + ".apk";
     final File apkFile = new File(tmpFolder, apkName);
     if (apkFile.exists()) {
       String suffixNew = target.equals("release") ? "release_unsigned" : "debug";
-      String apkNameNew = module + "/build/outputs/apk/" + 
+      String apkNameNew = getPathToAPK() + 
         sketch.getName().toLowerCase() + "_" + suffixNew + ".apk";
       final File apkFileNew = new File(tmpFolder, apkNameNew);
       apkFile.renameTo(apkFileNew);
     }
   }  
   
   
+  private String getPathToAPK() {
+    return module + "/build/outputs/apk/" + target + "/";
+  }
+  
+  
   /**
    * The Android dex util pukes on paths containing spaces, which will happen
    * most of the time on Windows, since Processing sketches wind up in
diff --git a/templates/AppBuild.gradle.tmpl b/templates/AppBuild.gradle.tmpl
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion @@target_sdk@@
-    buildToolsVersion "@@build_tools@@"
     defaultConfig {
         applicationId "@@package_name@@"
         minSdkVersion @@min_sdk@@
@@ -12,6 +11,10 @@ android {
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }      
     buildTypes {
         debug {
             debuggable true
@@ -24,14 +27,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:@@support_version@@'
-    compile 'com.android.support:design:@@support_version@@'
-    provided 'com.google.android.wearable:wearable:@@wear_version@@'
-    compile 'com.google.android.support:wearable:@@wear_version@@'
-    testCompile 'junit:junit:4.12'
-    compile files('libs/processing-core.jar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:@@support_version@@'
+    implementation 'com.android.support:design:@@support_version@@'
+    compileOnly 'com.google.android.wearable:wearable:@@wear_version@@'
+    implementation files('libs/processing-core.jar')    
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'    
 }
diff --git a/templates/AppBuildECJ.gradle.tmpl b/templates/AppBuildECJ.gradle.tmpl
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion @@target_sdk@@
-    buildToolsVersion "@@build_tools@@"
     defaultConfig {
         applicationId "@@package_name@@"
         minSdkVersion @@min_sdk@@
@@ -12,7 +11,10 @@ android {
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }    
     buildTypes {
         debug {
             debuggable true
@@ -58,7 +60,7 @@ android {
             
             // Running the JavaExec task, which requires the main class to run,
             // the classpath, and the list of arguments
-            // https://docs.gradle.org/3.5/dsl/org.gradle.api.tasks.JavaExec.html#org.gradle.api.tasks.JavaExec:main            
+            // https://docs.gradle.org/4.4/dsl/org.gradle.api.tasks.JavaExec.html#org.gradle.api.tasks.JavaExec:main            
             javaexec {
                 main ecjMain
                 classpath ecjClasspath
@@ -73,11 +75,10 @@ android {
 }
 
 dependencies {
-    provided files('@@tools_folder@@/../modes/java/mode/org.eclipse.jdt.core.jar')
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:@@support_version@@'
-    compile 'com.android.support:design:@@support_version@@'
-    provided 'com.google.android.wearable:wearable:@@wear_version@@'
-    compile 'com.google.android.support:wearable:@@wear_version@@'      
-    compile files('libs/processing-core.jar')
+    compileOnly files('@@tools_folder@@/../modes/java/mode/org.eclipse.jdt.core.jar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:@@support_version@@'
+    implementation 'com.android.support:design:@@support_version@@'
+    compileOnly 'com.google.android.wearable:wearable:@@wear_version@@'
+    implementation files('libs/processing-core.jar')
 }
diff --git a/templates/TopBuild.gradle.tmpl b/templates/TopBuild.gradle.tmpl
@@ -1,11 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,10 +16,8 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }        
     }
 }
 
diff --git a/templates/WearBuild.gradle.tmpl b/templates/WearBuild.gradle.tmpl
@@ -2,14 +2,17 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion @@target_sdk@@
-    buildToolsVersion "@@build_tools@@"
     defaultConfig {
         applicationId "@@package_name@@"
         minSdkVersion @@min_sdk@@
         targetSdkVersion @@target_sdk@@
         versionCode @@version_code@@
         versionName "@@version_name@@"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }    
     buildTypes {
         debug {
             debuggable true
@@ -23,11 +26,13 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:palette-v7:@@support_version@@'
-    compile 'com.google.android.gms:play-services-fitness:@@play_services_version@@'
-    compile 'com.google.android.gms:play-services-wearable:@@play_services_version@@'
-    compile 'com.android.support:support-v13:@@support_version@@'
-    provided 'com.google.android.wearable:wearable:@@wear_version@@'
-    compile 'com.google.android.support:wearable:@@wear_version@@'    
-    compile files('libs/processing-core.jar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:palette-v7:@@support_version@@'
+    implementation 'com.android.support:support-v4:@@support_version@@'
+    implementation 'com.google.android.gms:play-services-wearable:@@play_services_version@@'
+    implementation 'com.android.support:percent:@@support_version@@'
+    implementation 'com.android.support:recyclerview-v7:@@support_version@@'
+    implementation 'com.google.android.support:wearable:@@wear_version@@'
+    compileOnly 'com.google.android.wearable:wearable:@@wear_version@@'       
+    implementation files('libs/processing-core.jar')
 }
diff --git a/templates/WearBuildECJ.gradle.tmpl b/templates/WearBuildECJ.gradle.tmpl
@@ -2,14 +2,17 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion @@target_sdk@@
-    buildToolsVersion "@@build_tools@@"
     defaultConfig {
         applicationId "@@package_name@@"
         minSdkVersion @@min_sdk@@
         targetSdkVersion @@target_sdk@@
         versionCode @@version_code@@
         versionName "@@version_name@@"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }     
     buildTypes {
         debug {
             debuggable true
@@ -70,13 +73,18 @@ android {
 }
 
 dependencies {
-    provided files('@@tools_folder@@/../modes/java/mode/org.eclipse.jdt.core.jar')
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:palette-v7:@@support_version@@'
-    compile 'com.google.android.gms:play-services-fitness:@@play_services_version@@'
-    compile 'com.google.android.gms:play-services-wearable:@@play_services_version@@'
-    compile 'com.android.support:support-v13:@@support_version@@'
-    provided 'com.google.android.wearable:wearable:@@wear_version@@'
-    compile 'com.google.android.support:wearable:@@wear_version@@'    
-    compile files('libs/processing-core.jar')
+    compileOnly files('@@tools_folder@@/../modes/java/mode/org.eclipse.jdt.core.jar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:palette-v7:@@support_version@@'
+    implementation 'com.android.support:support-v4:@@support_version@@'
+    implementation 'com.google.android.gms:play-services-wearable:@@play_services_version@@'
+    implementation 'com.android.support:percent:@@support_version@@'
+    implementation 'com.android.support:recyclerview-v7:@@support_version@@'
+    implementation 'com.google.android.support:wearable:@@wear_version@@'
+    compileOnly 'com.google.android.wearable:wearable:@@wear_version@@'        
+    implementation files('libs/processing-core.jar')
 }
+
+
+    
+    
