renamed wearable jar

Author: codeanticode

core/.classpath

@@ -3,6 +3,6 @@
 	<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-1.4.0-classes.jar"/>
+	<classpathentry kind="lib" path="library/wearable-1.4.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/build.gradle

@@ -37,8 +37,8 @@ dependencies {
     // http://mvn.sibext.com/com/google/android/support/wearable/
     // http://uiq3.sourceforge.net/Repository/com/google/android/support/wearable/
     // MavenCentral and JCenter don't seem to have any wearable file.
-    // Use the wear-update script to create a new wearable-$version-classes jar
-    compile name: 'wearable-1.4.0-classes'
+    // Use the wear-update script to create a new wearable-$version jar
+    compile name: 'wearable-1.4.0'
 }
 
 sourceSets {

core/build.xml

@@ -42,7 +42,7 @@
 	   includeAntRuntime="false"
 	   bootclasspath="${env.ANDROID_SDK}/platforms/${android.platform}/android.jar;
     	              library/android-support-v4.jar;
-	                  library/wearable-${wear.version}-classes.jar"
+	                  library/wearable-${wear.version}.jar"
 	   srcdir="src" destdir="bin" />
 
     <!-- Copy the shaders to the bin folder. 

core/library/wearable-1.4.0-classes.jar core/library/wearable-1.4.0.jarcore/library/wearable-1.4.0-classes.jar renamed to core/library/wearable-1.4.0.jar

@@ -28,8 +28,8 @@ wget http://uiq3.sourceforge.net/Repository/com/google/android/support/wearable/
 # https://developer.android.com/studio/projects/android-library.html
 
 unzip wearable-$version.aar -d wearable
-cp wearable/classes.jar ../core/library/wearable-$version-classes.jar
-cp wearable/classes.jar ../mode/wearable-$version-classes.jar
+cp wearable/classes.jar ../core/library/wearable-$version.jar
+cp wearable/classes.jar ../mode/wearable-$version.jar
 
 # Remove left over files
 rm -Rf wearable

mode/wearable-1.4.0-classes.jar mode/wearable-1.4.0.jarmode/wearable-1.4.0-classes.jar renamed to mode/wearable-1.4.0.jar

@@ -340,9 +340,9 @@ public File createProject(boolean wear) throws IOException, SketchException {
       // cannot be resolved.
       // TODO: temporary hack until I find a better way to include the wearable aar
       // package included in the SDK:      
-      File wearJarFile = mode.getContentFile("mode/wearable-" + wear_version + "-classes.jar");
+      File wearJarFile = mode.getContentFile("mode/wearable-" + wear_version + ".jar");
       System.out.println(wearJarFile.toString());
-      Util.copyFile(wearJarFile, new File(libsFolder, "wearable" + wear_version + "classes.jar"));
+      Util.copyFile(wearJarFile, new File(libsFolder, "wearable-" + wear_version + ".jar"));
 //    }      
 
       // Copy any imported libraries (their libs and assets),