updated wear to 2.0.0

processing · Feb 10, 2017 · 161e04f · 161e04f
1 parent d885866
commit 161e04f
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
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-2.0.0-beta2.jar"/>
+	<classpathentry kind="lib" path="library/wearable-2.0.0.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-2.0.0-beta2'
+    compile name: 'wearable-2.0.0'
 }
 
 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="2.0.0-beta2" />	
+  <property name="wear.version" value="2.0.0" />	
 
   <!-- oh ant, you're so cute and convoluted -->
   <target name="build" depends="sdk_chatter,actual_build" />

diff --git a/core/library/wearable-2.0.0-beta2.jar → core/library/wearable-2.0.0.jar b/core/library/wearable-2.0.0-beta2.jar → core/library/wearable-2.0.0.jar
diff --git a/mode/wearable-2.0.0-beta2.jar → mode/wearable-2.0.0.jar b/mode/wearable-2.0.0-beta2.jar → mode/wearable-2.0.0.jar
diff --git a/scripts/wear-update.sh b/scripts/wear-update.sh
@@ -15,7 +15,7 @@
 # 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=2.0.0-beta2
+version=2.0.0
 
 cp $ANDROID_SDK/extras/google/m2repository/com/google/android/support/wearable/$version/wearable-$version.aar .
 

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 = "2.0.0-beta2";
+  static public final String wear_version = "2.0.0";
   static public final String gvr_sdk_version = "1.10.0";