retrieve support packages from android repository

Author: codeanticode

core/.classpath

@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="var" path="ANDROID_LIB"/>
-	<classpathentry kind="lib" path="library/android-support-v4.jar"/>
 	<classpathentry kind="lib" path="library/wearable-2.0.0.jar"/>
+	<classpathentry kind="lib" path="library/support-annotations-25.2.0.jar"/>
+	<classpathentry kind="lib" path="library/support-compat-25.2.0.jar"/>
+	<classpathentry kind="lib" path="library/support-fragment-25.2.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/build.gradle

@@ -10,7 +10,9 @@ buildscript {
 
 dependencies {
     compile name: 'android'
-    compile name: 'android-support-v4'
+    compile name: 'support-compat-25.2.0'
+    compile name: 'support-fragment-25.2.0'
+    compile name: 'support-annotations-25.2.0'
     compile name: 'wearable-2.0.0'
 }
 

core/build.xml

@@ -15,6 +15,9 @@
   <!-- Wear version to build the core library -->
   <property name="wear.version" value="2.0.0" />	
 
+  <!-- Support version to build the core library -->
+  <property name="support.version" value="25.2.0" />	
+	
   <!-- oh ant, you're so cute and convoluted -->
   <target name="build" depends="sdk_chatter,actual_build" />
 
@@ -41,7 +44,9 @@
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   bootclasspath="${env.ANDROID_SDK}/platforms/${android.platform}/android.jar;
-    	              library/android-support-v4.jar;
+    	              library/support-compat-${support.version}.jar;
+    	              library/support-fragment-${support.version}.jar;
+    	              library/support-annotations-${support.version}.jar;
 	                  library/wearable-${wear.version}.jar"
 	   srcdir="src" destdir="bin" />
 

core/library/android-support-v4.jar

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Usage:
+# call with the version number of the support packages to copy from local SDK and extract, i.e.:
+# ./wear-update.sh 2.0.0:
+
+version=$1
+
+cp $ANDROID_SDK/extras/android/m2repository/com/android/support/support-compat/$version/support-compat-$version.aar .
+unzip support-compat-$version.aar -d support-compat
+cp support-compat/classes.jar ../core/library/support-compat-$version.jar
+rm -Rf support-compat
+rm support-compat-$version.aar
+
+
+cp $ANDROID_SDK/extras/android/m2repository/com/android/support/support-fragment/$version/support-fragment-$version.aar .
+unzip support-fragment-$version.aar -d support-fragment
+cp support-fragment/classes.jar ../core/library/support-fragment-$version.jar
+rm -Rf support-fragment
+rm support-fragment-$version.aar
+
+cp $ANDROID_SDK/extras/android/m2repository/com/android/support/support-annotations/$version/support-annotations-$version.jar ../core/library
+
+# Done, print out reminder...
+echo ""
+echo "Done!"
+echo "Remember to update the version number of the support jars in processing-core"

core/library/support-annotations-25.2.0.jar

@@ -99,7 +99,9 @@ class AndroidBuild extends JavaBuild {
   static public final String target_sdk      = "25";  // Nougat (7.1.1)
   static public final String target_platform = "android-" + target_sdk;
 
-  // Versions of Wear and VR in use 
+  // Versions of Support, AppCompatn, Wear and VR in use
+  static public final String support_version = "25.2.0";
+  static public final String appcompat_version = "25.2.0";
   static public final String wear_version = "2.0.0";
   static public final String gvr_sdk_version = "1.20.0";
 
@@ -305,60 +307,37 @@ public File createProject(boolean wear) throws IOException, SketchException {
           }            
         }
       } catch (InterruptedException e) {}       
-        
-      if (getAppComponent() == FRAGMENT) {
-        // Need to add appcompat as a library project (includes v4 support)
-        
-        ////////////////////////////////////////////////////////////////////////
-        // first step: copy appcompat library project 
-        
-        // TODO: the support-v7 library project should be copied from the Android 
-        // Support Repository, and not from the Support Library.
-        File appCompatFolderSrc = new File(sdk.getSupportLibrary(), "v7/appcompat");
-        // Delete the project.properties files because Processing will regenerate 
-        // it when building the project
-        File propFile = new File(appCompatFolderSrc, "project.properties");
-        propFile.delete();
-        File appCompatFolder = new File(libsFolder, "appcompat");
-        Util.copyDir(appCompatFolderSrc, appCompatFolder);
-
-        ////////////////////////////////////////////////////////////////////////
-        // second step: create library projects
-        boolean appCompatRes = createLibraryProject("appcompat", targetID, 
-            appCompatFolder.getAbsolutePath(), "android.support.v7.appcompat");
-
-        ////////////////////////////////////////////////////////////////////////
-        // third step: reference library projects from main project        
-        if (appCompatRes) {
-          System.out.println("Library project created succesfully in " + libsFolder.toString());
-          appCompatRes = referenceLibraryProject(targetID, tmpFolder.getAbsolutePath(), "libs/appcompat");
-          if (appCompatRes) {
-            System.out.println("Library project referenced succesfully!");
-            // Finally, re-write the build files so they use org.eclipse.jdt.core.JDTCompilerAdapter
-            // instead of com.sun.tools.javac.Main
-            // TODO: use the build file generated by the android tools, and 
-            // add the custom section redefining the target
-            File appCompatBuildFile = new File(appCompatFolder, "build.xml");
-            writeBuildXML(appCompatBuildFile, "appcompat");
-          }
-        }
-      } else {
-        // Copy the v4 support package only, needed for the permission handling
-        // in all other components
-        File compatJarFile = new File(sdk.getSupportLibrary(), "v4/android-support-v4.jar");
-        Util.copyFile(compatJarFile, new File(libsFolder, "android-support-v4.jar"));        
-      }
 
-//    if (getAppComponent() == WATCHFACE) {
+      File wearAarFile, explodeDir; 
+      
       // The wear jar is needed even when the app is not a watch face, because on
       // devices with android < 5 the dependencies of the PWatchFace* classes
       // cannot be resolved.
       // TODO: temporary hack until I find a better way to include the wearable aar
       // package included in the SDK:      
-      File wearAarFile = new File(sdk.getWearableFolder(), wear_version + "/wearable-" + wear_version + ".aar");
-      File explodeDir = new File(tmpFolder, "aar");
-      AndroidMode.explodeAar(wearAarFile, explodeDir, new File(libsFolder, "wearable-" + wear_version + ".jar"));
-//    }      
+      wearAarFile = new File(sdk.getWearableFolder(), wear_version + "/wearable-" + wear_version + ".aar");
+      explodeDir = new File(tmpFolder, "aar");
+      AndroidMode.explodeAar(wearAarFile, explodeDir, new File(libsFolder, "wearable-" + wear_version + ".jar"));      
+      
+      // Copy support packages (compat, fragment, and annotations)      
+      wearAarFile = new File(sdk.getSupportLibrary(), "/support-compat/" + support_version + "/support-compat-" + support_version + ".aar");
+      explodeDir = new File(tmpFolder, "aar");
+      AndroidMode.explodeAar(wearAarFile, explodeDir, new File(libsFolder, "support-compat-" + support_version + ".jar"));
+      
+      wearAarFile = new File(sdk.getSupportLibrary(), "/support-fragment/" + support_version + "/support-fragment-" + support_version + ".aar");
+      explodeDir = new File(tmpFolder, "aar");
+      AndroidMode.explodeAar(wearAarFile, explodeDir, new File(libsFolder, "support-fragment-" + support_version + ".jar"));
+
+      wearAarFile = new File(sdk.getSupportLibrary(), "/support-annotations/" + support_version + "/support-annotations-" + support_version + ".aar");
+      explodeDir = new File(tmpFolder, "aar");
+      AndroidMode.explodeAar(wearAarFile, explodeDir, new File(libsFolder, "support-annotations-" + support_version + ".jar"));      
+      
+      if (getAppComponent() == FRAGMENT) {
+        // Copy support appcompat-v7 package
+        wearAarFile = new File(sdk.getSupportLibrary(), "/appcompat-v7/" + support_version + "/appcompat-v7-" + appcompat_version + ".aar");
+        explodeDir = new File(tmpFolder, "aar");
+        AndroidMode.explodeAar(wearAarFile, explodeDir, new File(libsFolder, "appcompat-v7-" + appcompat_version + ".jar"));      
+      }
 
       // Copy any imported libraries (their libs and assets),
       // and anything in the code folder contents to the project.

core/library/support-compat-25.2.0.jar

@@ -155,7 +155,7 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
       throw new BadSDKException("There is no wearable folder in " + folder);
     }
 
-    supportLibPath = new File(folder, "extras/android/support");
+    supportLibPath = new File(folder, "extras/android/m2repository/com/android/support");
     if (!supportLibPath.exists()) {
       throw new BadSDKException("There is no support library folder in " + folder);
     }