Merge pull request #129 from googlesamples/update_gms_dependencies

pchx · web-flow · commit 9278a0cfc707 · 2016-09-13T11:11:43.000-04:00
Updating all dependencies to the vision module of 9.4.0
diff --git a/visionSamples/FaceTracker/app/build.gradle b/visionSamples/FaceTracker/app/build.gradle
@@ -23,5 +23,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:support-v4:24.2.0'
     compile 'com.android.support:design:24.2.0'
-    compile 'com.google.android.gms:play-services-vision:9.4.0'
+    compile 'com.google.android.gms:play-services-vision:9.4.0+'
 }
diff --git a/visionSamples/barcode-reader/app/build.gradle b/visionSamples/barcode-reader/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
 
     defaultConfig {
         applicationId "com.google.android.gms.samples.vision.barcodereader"
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,8 +21,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:support-v4:24.2.0'
     // Important - the CameraSource implementation in this project requires version 8.1 or higher.
-    compile 'com.google.android.gms:play-services:8.1.0'
-    compile 'com.android.support:design:23.0.1'
+	compile 'com.google.android.gms:play-services-vision:9.4.0+'
+    compile 'com.android.support:design:24.2.0'
 }
diff --git a/visionSamples/barcode-reader/build.gradle b/visionSamples/barcode-reader/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/visionSamples/barcode-reader/gradle/wrapper/gradle-wrapper.properties b/visionSamples/barcode-reader/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/visionSamples/googly-eyes/app/build.gradle b/visionSamples/googly-eyes/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "com.google.android.gms.samples.vision.face.googlyeyes"
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23+'
-    compile 'com.google.android.gms:play-services:8.4.0'
-    compile 'com.android.support:design:23.0.0'
+	compile 'com.android.support:support-v4:24.2.0'
+	compile 'com.android.support:design:24.2.0'
+	compile 'com.google.android.gms:play-services-vision:9.4.0+'
 }
diff --git a/visionSamples/googly-eyes/build.gradle b/visionSamples/googly-eyes/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.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/visionSamples/googly-eyes/gradle/wrapper/gradle-wrapper.properties b/visionSamples/googly-eyes/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-2.14.1-all.zip
diff --git a/visionSamples/multi-tracker/app/build.gradle b/visionSamples/multi-tracker/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "com.google.android.gms.samples.vision.face.multitracker"
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23+'
-    compile 'com.google.android.gms:play-services:7.8.+'
-    compile 'com.android.support:design:23.0.0'
+	compile 'com.android.support:support-v4:24.2.0'
+    compile 'com.android.support:design:24.2.0'
+    compile 'com.google.android.gms:play-services-vision:9.4.0+'
 }
diff --git a/visionSamples/multi-tracker/build.gradle b/visionSamples/multi-tracker/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/visionSamples/multi-tracker/gradle/wrapper/gradle-wrapper.properties b/visionSamples/multi-tracker/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/visionSamples/ocr-codelab/ocr-reader-complete/app/build.gradle b/visionSamples/ocr-codelab/ocr-reader-complete/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "com.google.android.gms.samples.vision.barcodereader"
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.0.1'
-    compile 'com.google.android.gms:play-services-vision:9.0.0+'
-    compile 'com.android.support:design:23.0.1'
+	compile 'com.android.support:support-v4:24.2.0'
+    compile 'com.google.android.gms:play-services-vision:9.4.0+'
+    compile 'com.android.support:design:24.2.0'
 }
diff --git a/visionSamples/ocr-codelab/ocr-reader-complete/build.gradle b/visionSamples/ocr-codelab/ocr-reader-complete/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/visionSamples/ocr-codelab/ocr-reader-complete/gradle/wrapper/gradle-wrapper.properties b/visionSamples/ocr-codelab/ocr-reader-complete/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-2.14.1-all.zip
diff --git a/visionSamples/ocr-codelab/ocr-reader-start/app/build.gradle b/visionSamples/ocr-codelab/ocr-reader-start/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "com.google.android.gms.samples.vision.barcodereader"
         minSdkVersion 21
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.0.1'
-    compile 'com.android.support:design:23.0.1'
+	compile 'com.android.support:support-v4:24.2.0'
+    compile 'com.android.support:design:24.2.0'
 }
diff --git a/visionSamples/ocr-codelab/ocr-reader-start/build.gradle b/visionSamples/ocr-codelab/ocr-reader-start/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/visionSamples/ocr-codelab/ocr-reader-start/gradle/wrapper/gradle-wrapper.properties b/visionSamples/ocr-codelab/ocr-reader-start/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-2.14.1-all.zip
diff --git a/visionSamples/ocr-reader/app/build.gradle b/visionSamples/ocr-reader/app/build.gradle
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.0.1'
-    compile 'com.google.android.gms:play-services-vision:9.0.0+'
-    compile 'com.android.support:design:23.0.1'
+	compile 'com.android.support:support-v4:24.2.0'
+    compile 'com.google.android.gms:play-services-vision:9.4.0+'
+    compile 'com.android.support:design:24.2.0'
 }
diff --git a/visionSamples/ocr-reader/build.gradle b/visionSamples/ocr-reader/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/visionSamples/ocr-reader/gradle/wrapper/gradle-wrapper.properties b/visionSamples/ocr-reader/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-2.14.1-all.zip
diff --git a/visionSamples/photo-demo/app/build.gradle b/visionSamples/photo-demo/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "com.google.android.gms.samples.vision.face.photo"
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -22,5 +22,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.0.0'
-    compile 'com.google.android.gms:play-services:7.8.+'
+    compile 'com.google.android.gms:play-services-vision:9.4.0'
 }
diff --git a/visionSamples/photo-demo/build.gradle b/visionSamples/photo-demo/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/visionSamples/photo-demo/gradle/wrapper/gradle-wrapper.properties b/visionSamples/photo-demo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ dependencies {`
`23`	`23`	`compile fileTree(dir: 'libs', include: ['*.jar'])`
`24`	`24`	`compile 'com.android.support:support-v4:24.2.0'`
`25`	`25`	`compile 'com.android.support:design:24.2.0'`
`26`		`- compile 'com.google.android.gms:play-services-vision:9.4.0'`
	`26`	`+ compile 'com.google.android.gms:play-services-vision:9.4.0+'`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:1.3.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.1.3'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`