Skip to content

Commit 9278a0c

Browse files
authored
Merge pull request #129 from googlesamples/update_gms_dependencies
Updating all dependencies to the vision module of 9.4.0
2 parents f3719b7 + d5f6be6 commit 9278a0c

File tree

22 files changed

+50
-50
lines changed

22 files changed

+50
-50
lines changed

visionSamples/FaceTracker/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile 'com.android.support:support-v4:24.2.0'
2525
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+'
2727
}
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.1"
66

77
defaultConfig {
88
applicationId "com.google.android.gms.samples.vision.barcodereader"
99
minSdkVersion 9
10-
targetSdkVersion 23
10+
targetSdkVersion 24
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,8 +21,8 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:support-v4:23.0.1'
24+
compile 'com.android.support:support-v4:24.2.0'
2525
// Important - the CameraSource implementation in this project requires version 8.1 or higher.
26-
compile 'com.google.android.gms:play-services:8.1.0'
27-
compile 'com.android.support:design:23.0.1'
26+
compile 'com.google.android.gms:play-services-vision:9.4.0+'
27+
compile 'com.android.support:design:24.2.0'
2828
}

visionSamples/barcode-reader/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.3.1'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

visionSamples/barcode-reader/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.2"
66

77
defaultConfig {
88
applicationId "com.google.android.gms.samples.vision.face.googlyeyes"
99
minSdkVersion 9
10-
targetSdkVersion 23
10+
targetSdkVersion 24
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:support-v4:23+'
25-
compile 'com.google.android.gms:play-services:8.4.0'
26-
compile 'com.android.support:design:23.0.0'
24+
compile 'com.android.support:support-v4:24.2.0'
25+
compile 'com.android.support:design:24.2.0'
26+
compile 'com.google.android.gms:play-services-vision:9.4.0+'
2727
}

visionSamples/googly-eyes/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.0.0'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

visionSamples/googly-eyes/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.2"
66

77
defaultConfig {
88
applicationId "com.google.android.gms.samples.vision.face.multitracker"
99
minSdkVersion 9
10-
targetSdkVersion 23
10+
targetSdkVersion 24
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:support-v4:23+'
25-
compile 'com.google.android.gms:play-services:7.8.+'
26-
compile 'com.android.support:design:23.0.0'
24+
compile 'com.android.support:support-v4:24.2.0'
25+
compile 'com.android.support:design:24.2.0'
26+
compile 'com.google.android.gms:play-services-vision:9.4.0+'
2727
}

visionSamples/multi-tracker/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.3'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

visionSamples/multi-tracker/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

visionSamples/ocr-codelab/ocr-reader-complete/app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.2"
66

77
defaultConfig {
88
applicationId "com.google.android.gms.samples.vision.barcodereader"
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:support-v4:23.0.1'
25-
compile 'com.google.android.gms:play-services-vision:9.0.0+'
26-
compile 'com.android.support:design:23.0.1'
24+
compile 'com.android.support:support-v4:24.2.0'
25+
compile 'com.google.android.gms:play-services-vision:9.4.0+'
26+
compile 'com.android.support:design:24.2.0'
2727
}

visionSamples/ocr-codelab/ocr-reader-complete/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

visionSamples/ocr-codelab/ocr-reader-complete/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

visionSamples/ocr-codelab/ocr-reader-start/app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.2"
66

77
defaultConfig {
88
applicationId "com.google.android.gms.samples.vision.barcodereader"
99
minSdkVersion 21
10-
targetSdkVersion 23
10+
targetSdkVersion 24
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,6 +21,6 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:support-v4:23.0.1'
25-
compile 'com.android.support:design:23.0.1'
24+
compile 'com.android.support:support-v4:24.2.0'
25+
compile 'com.android.support:design:24.2.0'
2626
}

visionSamples/ocr-codelab/ocr-reader-start/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

visionSamples/ocr-codelab/ocr-reader-start/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

visionSamples/ocr-reader/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:support-v4:23.0.1'
25-
compile 'com.google.android.gms:play-services-vision:9.0.0+'
26-
compile 'com.android.support:design:23.0.1'
24+
compile 'com.android.support:support-v4:24.2.0'
25+
compile 'com.google.android.gms:play-services-vision:9.4.0+'
26+
compile 'com.android.support:design:24.2.0'
2727
}

visionSamples/ocr-reader/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

visionSamples/ocr-reader/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

visionSamples/photo-demo/app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.2"
66

77
defaultConfig {
88
applicationId "com.google.android.gms.samples.vision.face.photo"
99
minSdkVersion 9
10-
targetSdkVersion 22
10+
targetSdkVersion 24
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -22,5 +22,5 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile 'com.android.support:appcompat-v7:22.0.0'
25-
compile 'com.google.android.gms:play-services:7.8.+'
25+
compile 'com.google.android.gms:play-services-vision:9.4.0'
2626
}

visionSamples/photo-demo/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.3'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

visionSamples/photo-demo/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)