From d06e427ae6ab8ed58bb31366e5b65a9505109eb7 Mon Sep 17 00:00:00 2001 From: google-automerger Date: Thu, 21 May 2015 10:04:49 -0700 Subject: [PATCH] Auto-update --- .google/packaging.yaml | 1 + NOTICE | 1 + README.md | 1 + Wearable/build.gradle | 16 ++++++++++++---- settings.gradle | 1 + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.google/packaging.yaml b/.google/packaging.yaml index 3c0c5e3..bbaa3d3 100644 --- a/.google/packaging.yaml +++ b/.google/packaging.yaml @@ -1,3 +1,4 @@ + # GOOGLE SAMPLE PACKAGING DATA # # This file is used by Google as part of our samples packaging process. diff --git a/NOTICE b/NOTICE index e37ec1a..05e0e2e 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,4 @@ + This sample uses the following software: Copyright 2015 The Android Open Source Project diff --git a/README.md b/README.md index eff9639..8f708f2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + Android GridViewPager Sample =================================== diff --git a/Wearable/build.gradle b/Wearable/build.gradle index 5a11dce..83ca0d5 100644 --- a/Wearable/build.gradle +++ b/Wearable/build.gradle @@ -1,10 +1,11 @@ + buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.1.0' } } @@ -15,9 +16,10 @@ apply plugin: 'com.android.application' dependencies { - compile 'com.google.android.gms:play-services-wearable:7.3.0+' + + compile 'com.google.android.gms:play-services-wearable:7.3.0' compile 'com.android.support:support-v13:22.1.0' - compile 'com.google.android.support:wearable:1.1.+' + compile 'com.google.android.support:wearable:1.2.0' } // The sample build uses multiple directories to @@ -44,6 +46,12 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt') } } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + sourceSets { main { dirs.each { dir -> diff --git a/settings.gradle b/settings.gradle index 1d97d30..9c2651c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ + include ':Wearable'