updated to wear-2.0.0-beta2

codeanticode · codeanticode · commit 323d421e3719 · 2017-02-09T16:36:38.000-05:00
diff --git a/core/.classpath b/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.jar"/>
+	<classpathentry kind="lib" path="library/wearable-2.0.0-beta2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/build.gradle b/core/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 dependencies {
     compile name: 'android'
     compile name: 'android-support-v4'
-    compile name: 'wearable-1.4.0'
+    compile name: 'wearable-2.0.0-beta2'
 }
 
 sourceSets {
diff --git a/core/build.xml b/core/build.xml
@@ -13,7 +13,7 @@
   <property name="android.platform" value="android-23" />
 
   <!-- Wear version to build the core library -->
-  <property name="wear.version" value="1.4.0" />	
+  <property name="wear.version" value="2.0.0-beta2" />	
 	
   <!-- oh ant, you're so cute and convoluted -->
   <target name="build" depends="sdk_chatter,actual_build" />
diff --git a/core/library/wearable-1.4.0.jar b/core/library/wearable-1.4.0.jar
diff --git a/core/library/wearable-2.0.0-beta2.jar b/core/library/wearable-2.0.0-beta2.jar
diff --git a/core/src/processing/android/PWatchFaceCanvas.java b/core/src/processing/android/PWatchFaceCanvas.java
@@ -130,6 +130,7 @@ public boolean canDraw() {
   }
 
   private class CEngine extends CanvasWatchFaceService.Engine {
+    @SuppressWarnings("deprecation")
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);
diff --git a/core/src/processing/android/PWatchFaceGLES.java b/core/src/processing/android/PWatchFaceGLES.java
@@ -128,6 +128,7 @@ public boolean canDraw() {
   }
 
   private class GLEngine extends Gles2WatchFaceService.Engine {
+    @SuppressWarnings("deprecation")
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -481,7 +481,7 @@ public void initSurface(AppComponent component, SurfaceHolder holder) {
   public void initSurface(LayoutInflater inflater, ViewGroup container,
                           Bundle savedInstanceState,
                           AppComponent component, SurfaceHolder holder) {
-    if (DEBUG) println("onCreateView() happening here: " + Thread.currentThread().getName());
+    if (DEBUG) println("initSurface() happening here: " + Thread.currentThread().getName());
 
     component.initDimensions();
     displayWidth = component.getDisplayWidth();
diff --git a/mode/wearable-1.4.0.jar b/mode/wearable-1.4.0.jar
diff --git a/mode/wearable-2.0.0-beta2.jar b/mode/wearable-2.0.0-beta2.jar
diff --git a/scripts/wear-update.sh b/scripts/wear-update.sh
@@ -1,25 +1,23 @@
 #!/bin/bash
 
-# I have being unable to find Google's repository from where Android Studio gets the wear
-# aar files. People have been trying to solve this in relation to using Eclipse to build
-# wear apps, for example:
-# http://stackoverflow.com/questions/27913902/dependencies-from-android-gradle-build-or-how-to-build-an-android-wear-app-wit
-# However, both JCenter and Maven Central don't seem to hold any wearable pacakges:
-# https://jcenter.bintray.com/com/google/android/
-# https://search.maven.org/#search%7Cga%7C1%7Cwearable
-# So far, only found two odd repostories with up-to-date versions of the aar packages:
-# http://uiq3.sourceforge.net/Repository/com/google/android/support/wearable/
-# http://mvn.sibext.com/com/google/android/support/wearable/
-# (one is maintained by a company in Siberia)
+# The addon repository description file:
+#
+# https://dl.google.com/android/repository/addon.xml
+# 
+# contains the entry Google Repository (Local Maven repository for Support Libraries)
+# which holds the latest file with the wearable pacakges
+#
+# On an already installed SDK, they should be available in:
+#
+# $ANDROID_SDK/extras/google/m2repository/com/google/android/support/wearable/$version/
 
 # Usage:
-# call with the version number of the wearable package to download and extract, i.e.:
-# ./wear-update.sh 1.4.0
+# call with the version number of the wearable package to copy from local SDK and extract, i.e.:
+# ./wear-update.sh 2.0.0-beta2:
 
-version=$1
+version=2.0.0-beta2
 
-# Download the requested aar package from the sourceforge repository
-wget http://uiq3.sourceforge.net/Repository/com/google/android/support/wearable/$version/wearable-$version.aar
+cp $ANDROID_SDK/extras/google/m2repository/com/google/android/support/wearable/$version/wearable-$version.aar .
 
 # Now unzip, and extract the classes jar. For more information on the aar format and how
 # to use it in Eclipse, see this blogposts:
@@ -28,6 +26,7 @@ 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.jar
 cp wearable/classes.jar ../mode/wearable-$version.jar
 
@@ -38,4 +37,4 @@ rm wearable-$version.aar
 # Done, print out reminder...
 echo ""
 echo "Done!"
-echo "Remember to update the version number of the wearable jar in processing-core's source code"
+echo "Remember to update the version number of the wearable jar in processing-core's source code"
diff --git a/src/processing/mode/android/AndroidBuild.java b/src/processing/mode/android/AndroidBuild.java
@@ -90,7 +90,7 @@ class AndroidBuild extends JavaBuild {
   static public final String target_platform = "android-" + target_sdk;
 
   // Versions of Wear and VR in use 
-  static public final String wear_version = "1.4.0";
+  static public final String wear_version = "2.0.0-beta2";
   static public final String gvr_sdk_version = "1.10.0";
   
   
diff --git a/src/processing/mode/android/AndroidMode.java b/src/processing/mode/android/AndroidMode.java
@@ -58,7 +58,6 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.SwingConstants;
 
 
 public class AndroidMode extends JavaMode {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ buildscript {`
`11`	`11`	`dependencies {`
`12`	`12`	`compile name: 'android'`
`13`	`13`	`compile name: 'android-support-v4'`
`14`		`- compile name: 'wearable-1.4.0'`
	`14`	`+ compile name: 'wearable-2.0.0-beta2'`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ public boolean canDraw() {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private class CEngine extends CanvasWatchFaceService.Engine {`
	`133`	`+ @SuppressWarnings("deprecation")`
`133`	`134`	`@Override`
`134`	`135`	`public void onCreate(SurfaceHolder surfaceHolder) {`
`135`	`136`	`super.onCreate(surfaceHolder);`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ public boolean canDraw() {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`private class GLEngine extends Gles2WatchFaceService.Engine {`
	`131`	`+ @SuppressWarnings("deprecation")`
`131`	`132`	`@Override`
`132`	`133`	`public void onCreate(SurfaceHolder surfaceHolder) {`
`133`	`134`	`super.onCreate(surfaceHolder);`