updated to wear v2 and removed unused mobile

JimSeker · Mar 24, 2017 · b3a9cab · b3a9cab
1 parent 220be35
commit b3a9cab
Show file tree

Hide file tree

Showing 44 changed files with 26 additions and 204 deletions.
diff --git a/WearApp/.idea/gradle.xml b/WearApp/.idea/gradle.xml
diff --git a/WearApp/.idea/misc.xml b/WearApp/.idea/misc.xml
diff --git a/WearApp/.idea/modules.xml b/WearApp/.idea/modules.xml
diff --git a/WearApp/build.gradle b/WearApp/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/WearApp/gradle/wrapper/gradle-wrapper.properties b/WearApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Fri Mar 24 13:07:10 MDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/WearApp/mobile/.gitignore b/WearApp/mobile/.gitignore
diff --git a/WearApp/mobile/build.gradle b/WearApp/mobile/build.gradle
diff --git a/WearApp/mobile/proguard-rules.pro b/WearApp/mobile/proguard-rules.pro
diff --git a/WearApp/mobile/src/main/AndroidManifest.xml b/WearApp/mobile/src/main/AndroidManifest.xml
diff --git a/WearApp/mobile/src/main/res/mipmap-hdpi/ic_launcher.png b/WearApp/mobile/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/WearApp/mobile/src/main/res/mipmap-mdpi/ic_launcher.png b/WearApp/mobile/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/WearApp/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/WearApp/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/WearApp/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/WearApp/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/WearApp/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/WearApp/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/WearApp/mobile/src/main/res/raw/wearapp.apk b/WearApp/mobile/src/main/res/raw/wearapp.apk
diff --git a/WearApp/mobile/src/main/res/values/colors.xml b/WearApp/mobile/src/main/res/values/colors.xml
diff --git a/WearApp/mobile/src/main/res/values/strings.xml b/WearApp/mobile/src/main/res/values/strings.xml
diff --git a/WearApp/mobile/src/main/res/values/styles.xml b/WearApp/mobile/src/main/res/values/styles.xml
diff --git a/WearApp/mobile/src/main/res/xml/wearable_app_desc.xml b/WearApp/mobile/src/main/res/xml/wearable_app_desc.xml
diff --git a/WearApp/settings.gradle b/WearApp/settings.gradle
@@ -1 +1 @@
-include ':mobile', ':wear'
+include ':wear'
diff --git a/WearApp/wear/build.gradle b/WearApp/wear/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "edu.cs4730.wearapp"
@@ -22,6 +22,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.support:wearable:1.3.0'
-    compile 'com.google.android.gms:play-services-wearable:8.4.0'
+    //compile 'com.google.android.support:wearable:1.3.0'
+    compile 'com.google.android.gms:play-services-wearable:10.2.1'
+    compile 'com.google.android.support:wearable:2.0.0'
+    provided 'com.google.android.wearable:wearable:2.0.0'
 }
diff --git a/WearApp/wear/src/main/res/layout/activity_main.xml b/WearApp/wear/src/main/res/layout/activity_main.xml
@@ -8,4 +8,4 @@
     app:rectLayout="@layout/rect_activity_main"
     app:roundLayout="@layout/round_activity_main"
     tools:context="edu.cs4730.wearapp.MainActivity"
-    tools:deviceIds="wear"></android.support.wearable.view.WatchViewStub>
+    tools:deviceIds="wear"/>
diff --git a/WearAppv23/.idea/.name b/WearAppv23/.idea/.name
diff --git a/WearAppv23/.idea/gradle.xml b/WearAppv23/.idea/gradle.xml
diff --git a/WearAppv23/.idea/misc.xml b/WearAppv23/.idea/misc.xml
diff --git a/WearAppv23/.idea/modules.xml b/WearAppv23/.idea/modules.xml
diff --git a/WearAppv23/build.gradle b/WearAppv23/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/WearAppv23/gradle/wrapper/gradle-wrapper.properties b/WearAppv23/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Fri Mar 24 13:01:22 MDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/WearAppv23/mobile/.gitignore b/WearAppv23/mobile/.gitignore
diff --git a/WearAppv23/mobile/build.gradle b/WearAppv23/mobile/build.gradle
diff --git a/WearAppv23/mobile/proguard-rules.pro b/WearAppv23/mobile/proguard-rules.pro
diff --git a/WearAppv23/mobile/src/main/AndroidManifest.xml b/WearAppv23/mobile/src/main/AndroidManifest.xml
diff --git a/WearAppv23/mobile/src/main/res/mipmap-hdpi/ic_launcher.png b/WearAppv23/mobile/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/WearAppv23/mobile/src/main/res/mipmap-mdpi/ic_launcher.png b/WearAppv23/mobile/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/WearAppv23/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/WearAppv23/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/WearAppv23/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/WearAppv23/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/WearAppv23/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/WearAppv23/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/WearAppv23/mobile/src/main/res/raw/wearapp.apk b/WearAppv23/mobile/src/main/res/raw/wearapp.apk
diff --git a/WearAppv23/mobile/src/main/res/values/colors.xml b/WearAppv23/mobile/src/main/res/values/colors.xml
diff --git a/WearAppv23/mobile/src/main/res/values/strings.xml b/WearAppv23/mobile/src/main/res/values/strings.xml
diff --git a/WearAppv23/mobile/src/main/res/values/styles.xml b/WearAppv23/mobile/src/main/res/values/styles.xml
diff --git a/WearAppv23/mobile/src/main/res/xml/wearable_app_desc.xml b/WearAppv23/mobile/src/main/res/xml/wearable_app_desc.xml
diff --git a/WearAppv23/settings.gradle b/WearAppv23/settings.gradle
@@ -1 +1 @@
-include ':mobile', ':wear'
+include ':wear'
diff --git a/WearAppv23/wear/build.gradle b/WearAppv23/wear/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "edu.cs4730.wearapp"
         minSdkVersion 20
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -22,6 +22,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.support:wearable:1.3.0'
-    compile 'com.google.android.gms:play-services-wearable:8.4.0'
+    //compile 'com.google.android.support:wearable:1.3.0'
+    compile 'com.google.android.gms:play-services-wearable:10.2.1'
+    compile 'com.google.android.support:wearable:2.0.0'
+    provided 'com.google.android.wearable:wearable:2.0.0'
 }