diff --git a/samples/wearable/AgendaData/Application/build.gradle b/samples/wearable/AgendaData/Application/build.gradle index 7de0d36a1..9c68a1864 100644 --- a/samples/wearable/AgendaData/Application/build.gradle +++ b/samples/wearable/AgendaData/Application/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - aaptOptions { - noCompress 'apk' - } } dependencies { diff --git a/samples/wearable/AgendaData/build.gradle b/samples/wearable/AgendaData/build.gradle index 07be865b5..d3c8c5971 100644 --- a/samples/wearable/AgendaData/build.gradle +++ b/samples/wearable/AgendaData/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/AgendaData/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/AgendaData/gradlew.bat b/samples/wearable/AgendaData/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/DataLayer/Application/build.gradle b/samples/wearable/DataLayer/Application/build.gradle index 9568da46f..954fe382f 100644 --- a/samples/wearable/DataLayer/Application/build.gradle +++ b/samples/wearable/DataLayer/Application/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - aaptOptions { - noCompress 'apk' - } } dependencies { diff --git a/samples/wearable/DataLayer/build.gradle b/samples/wearable/DataLayer/build.gradle index 07be865b5..d3c8c5971 100644 --- a/samples/wearable/DataLayer/build.gradle +++ b/samples/wearable/DataLayer/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/DataLayer/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/DataLayer/gradlew.bat b/samples/wearable/DataLayer/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/DelayedConfirmation/Application/build.gradle b/samples/wearable/DelayedConfirmation/Application/build.gradle index ef83ddd2c..66022aaa1 100644 --- a/samples/wearable/DelayedConfirmation/Application/build.gradle +++ b/samples/wearable/DelayedConfirmation/Application/build.gradle @@ -17,14 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - aaptOptions { - noCompress 'apk' - } - - lintOptions { - abortOnError false - } } dependencies { diff --git a/samples/wearable/DelayedConfirmation/Wearable/build.gradle b/samples/wearable/DelayedConfirmation/Wearable/build.gradle index fa6b67ab0..968d9da51 100644 --- a/samples/wearable/DelayedConfirmation/Wearable/build.gradle +++ b/samples/wearable/DelayedConfirmation/Wearable/build.gradle @@ -17,11 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - lintOptions { - abortOnError false - } - } dependencies { diff --git a/samples/wearable/DelayedConfirmation/build.gradle b/samples/wearable/DelayedConfirmation/build.gradle index 07be865b5..d3c8c5971 100644 --- a/samples/wearable/DelayedConfirmation/build.gradle +++ b/samples/wearable/DelayedConfirmation/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/DelayedConfirmation/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/DelayedConfirmation/gradlew.bat b/samples/wearable/DelayedConfirmation/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/ElizaChat/build.gradle b/samples/wearable/ElizaChat/build.gradle index 0b1d4e621..fa46e0cd1 100644 --- a/samples/wearable/ElizaChat/build.gradle +++ b/samples/wearable/ElizaChat/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/ElizaChat/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/ElizaChat/gradlew.bat b/samples/wearable/ElizaChat/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/FindMyPhone/Application/build.gradle b/samples/wearable/FindMyPhone/Application/build.gradle index 7de0d36a1..9c68a1864 100644 --- a/samples/wearable/FindMyPhone/Application/build.gradle +++ b/samples/wearable/FindMyPhone/Application/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - aaptOptions { - noCompress 'apk' - } } dependencies { diff --git a/samples/wearable/FindMyPhone/build.gradle b/samples/wearable/FindMyPhone/build.gradle index f9e56eeb4..488357fba 100644 --- a/samples/wearable/FindMyPhone/build.gradle +++ b/samples/wearable/FindMyPhone/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/FindMyPhone/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/FindMyPhone/gradlew.bat b/samples/wearable/FindMyPhone/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/Flashlight/Wearable/build.gradle b/samples/wearable/Flashlight/Wearable/build.gradle index 58ffd2cf4..2a520308a 100644 --- a/samples/wearable/Flashlight/Wearable/build.gradle +++ b/samples/wearable/Flashlight/Wearable/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - lintOptions { - abortOnError false - } } dependencies { diff --git a/samples/wearable/Flashlight/Wearable/src/main/java/com/example/android/wearable/flashlight/MainActivity.java b/samples/wearable/Flashlight/Wearable/src/main/java/com/example/android/wearable/flashlight/MainActivity.java index f32b993e1..120e3a1f8 100644 --- a/samples/wearable/Flashlight/Wearable/src/main/java/com/example/android/wearable/flashlight/MainActivity.java +++ b/samples/wearable/Flashlight/Wearable/src/main/java/com/example/android/wearable/flashlight/MainActivity.java @@ -77,7 +77,7 @@ public class MainActivity extends Activity { } } - static class WhiteLightFragment extends Fragment { + public static class WhiteLightFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -86,7 +86,7 @@ public class MainActivity extends Activity { } } - static class PartyLightFragment extends Fragment { + public static class PartyLightFragment extends Fragment { private PartyLightView mView; diff --git a/samples/wearable/Flashlight/build.gradle b/samples/wearable/Flashlight/build.gradle index 4c8f6d8b9..e33f14283 100644 --- a/samples/wearable/Flashlight/build.gradle +++ b/samples/wearable/Flashlight/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/Flashlight/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/Geofencing/Application/build.gradle b/samples/wearable/Geofencing/Application/build.gradle index 7de0d36a1..9c68a1864 100644 --- a/samples/wearable/Geofencing/Application/build.gradle +++ b/samples/wearable/Geofencing/Application/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - aaptOptions { - noCompress 'apk' - } } dependencies { diff --git a/samples/wearable/Geofencing/build.gradle b/samples/wearable/Geofencing/build.gradle index 07be865b5..d3c8c5971 100644 --- a/samples/wearable/Geofencing/build.gradle +++ b/samples/wearable/Geofencing/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/Geofencing/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/Geofencing/gradlew.bat b/samples/wearable/Geofencing/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/GridViewPager/Wearable/build.gradle b/samples/wearable/GridViewPager/Wearable/build.gradle index 58ffd2cf4..2a520308a 100644 --- a/samples/wearable/GridViewPager/Wearable/build.gradle +++ b/samples/wearable/GridViewPager/Wearable/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - lintOptions { - abortOnError false - } } dependencies { diff --git a/samples/wearable/GridViewPager/build.gradle b/samples/wearable/GridViewPager/build.gradle index 8bafed410..8bd4ffc49 100644 --- a/samples/wearable/GridViewPager/build.gradle +++ b/samples/wearable/GridViewPager/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/GridViewPager/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/JumpingJack/Wearable/build.gradle b/samples/wearable/JumpingJack/Wearable/build.gradle index c07ae51b7..24ea9f1d3 100644 --- a/samples/wearable/JumpingJack/Wearable/build.gradle +++ b/samples/wearable/JumpingJack/Wearable/build.gradle @@ -14,6 +14,7 @@ android { versionCode 1 versionName "1.0" } + buildTypes { release { runProguard false @@ -24,7 +25,6 @@ android { lintOptions { abortOnError false } - } dependencies { diff --git a/samples/wearable/JumpingJack/build.gradle b/samples/wearable/JumpingJack/build.gradle index ce58a8f6a..f93ab8440 100644 --- a/samples/wearable/JumpingJack/build.gradle +++ b/samples/wearable/JumpingJack/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/JumpingJack/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/JumpingJack/gradlew.bat b/samples/wearable/JumpingJack/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/Notifications/Application/build.gradle b/samples/wearable/Notifications/Application/build.gradle index 32208a32a..e44e24dda 100644 --- a/samples/wearable/Notifications/Application/build.gradle +++ b/samples/wearable/Notifications/Application/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - aaptOptions { - noCompress 'apk' - } } dependencies { diff --git a/samples/wearable/Notifications/build.gradle b/samples/wearable/Notifications/build.gradle index 8bafed410..8bd4ffc49 100644 --- a/samples/wearable/Notifications/build.gradle +++ b/samples/wearable/Notifications/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/Notifications/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/Quiz/Application/build.gradle b/samples/wearable/Quiz/Application/build.gradle index 8482f3413..e35574c43 100644 --- a/samples/wearable/Quiz/Application/build.gradle +++ b/samples/wearable/Quiz/Application/build.gradle @@ -17,10 +17,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - - aaptOptions { - noCompress 'apk' - } } dependencies { diff --git a/samples/wearable/Quiz/build.gradle b/samples/wearable/Quiz/build.gradle index 4c8f6d8b9..e33f14283 100644 --- a/samples/wearable/Quiz/build.gradle +++ b/samples/wearable/Quiz/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/Quiz/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/RecipeAssistant/build.gradle b/samples/wearable/RecipeAssistant/build.gradle index 4c8f6d8b9..e33f14283 100644 --- a/samples/wearable/RecipeAssistant/build.gradle +++ b/samples/wearable/RecipeAssistant/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/RecipeAssistant/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/RecipeAssistant/gradlew.bat b/samples/wearable/RecipeAssistant/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/SkeletonWearableApp/build.gradle b/samples/wearable/SkeletonWearableApp/build.gradle index d9bdcb344..43dbcd071 100644 --- a/samples/wearable/SkeletonWearableApp/build.gradle +++ b/samples/wearable/SkeletonWearableApp/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/SkeletonWearableApp/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/Timer/build.gradle b/samples/wearable/Timer/build.gradle index 4c8f6d8b9..e33f14283 100644 --- a/samples/wearable/Timer/build.gradle +++ b/samples/wearable/Timer/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/Timer/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/Timer/gradlew.bat b/samples/wearable/Timer/gradlew.bat old mode 100644 new mode 100755 diff --git a/samples/wearable/WatchViewStub/build.gradle b/samples/wearable/WatchViewStub/build.gradle index d9bdcb344..43dbcd071 100644 --- a/samples/wearable/WatchViewStub/build.gradle +++ b/samples/wearable/WatchViewStub/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/WatchViewStub/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/samples/wearable/build.gradle b/samples/wearable/build.gradle index c55e0693e..643f04414 100644 --- a/samples/wearable/build.gradle +++ b/samples/wearable/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/samples/wearable/gradle/wrapper/gradle-wrapper.jar b/samples/wearable/gradle/wrapper/gradle-wrapper.jar index 583859812..8c0fb64a8 100644 Binary files a/samples/wearable/gradle/wrapper/gradle-wrapper.jar and b/samples/wearable/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/wearable/gradle/wrapper/gradle-wrapper.properties b/samples/wearable/gradle/wrapper/gradle-wrapper.properties index e83e46081..1e61d1fd3 100644 --- a/samples/wearable/gradle/wrapper/gradle-wrapper.properties +++ b/samples/wearable/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 14 14:02:22 PDT 2014 +#Wed Apr 10 15:27:10 PDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip