From 912c9626ac475ae04696f8e47e0b00a5e87dfb9d Mon Sep 17 00:00:00 2001
From: Nhan Cao <nhancv92@gmail.com>
Date: Wed, 1 May 2019 16:57:34 +0700
Subject: [PATCH] Update build tool version

---
 speech/Speech/app/build.gradle                | 49 +++++++------------
 speech/Speech/build.gradle                    |  8 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +-
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/speech/Speech/app/build.gradle b/speech/Speech/app/build.gradle
index 8399f24e..eb4dc1b2 100644
--- a/speech/Speech/app/build.gradle
+++ b/speech/Speech/app/build.gradle
@@ -18,17 +18,17 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
 
 ext {
-    supportLibraryVersion = '25.4.0'
-    grpcVersion = '1.4.0'
+    supportLibraryVersion = '28.0.0'
+    grpcVersion = '1.20.0'
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.cloud.android.speech"
-        targetSdkVersion 25
+        targetSdkVersion 28
+        minSdkVersion 21
         versionCode 1
         versionName '1.0'
     }
@@ -42,17 +42,6 @@ android {
         }
     }
 
-    productFlavors {
-        dev {
-            // Minimum version with platform multi-dex support
-            minSdkVersion 21
-        }
-        prod {
-            // Minimum version that can run gRPC (TLS extension)
-            minSdkVersion 16
-        }
-    }
-
     buildTypes {
         debug {
             minifyEnabled false
@@ -73,7 +62,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.3.0'
+        artifact = 'com.google.protobuf:protoc:3.7.1'
     }
     plugins {
         javalite {
@@ -97,29 +86,29 @@ protobuf {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Support libraries
-    compile "com.android.support:design:$supportLibraryVersion"
-    compile "com.android.support:cardview-v7:$supportLibraryVersion"
-    compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
+    implementation "com.android.support:design:$supportLibraryVersion"
+    implementation "com.android.support:cardview-v7:$supportLibraryVersion"
+    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
 
     // gRPC
-    compile "io.grpc:grpc-okhttp:$grpcVersion"
-    compile "io.grpc:grpc-protobuf-lite:$grpcVersion"
-    compile "io.grpc:grpc-stub:$grpcVersion"
-    compile 'javax.annotation:javax.annotation-api:1.2'
-    protobuf 'com.google.protobuf:protobuf-java:3.3.1'
+    implementation "io.grpc:grpc-okhttp:$grpcVersion"
+    implementation "io.grpc:grpc-protobuf-lite:$grpcVersion"
+    implementation "io.grpc:grpc-stub:$grpcVersion"
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    protobuf 'com.google.protobuf:protobuf-java:3.7.1'
 
     // OAuth2 for Google API
-    compile('com.google.auth:google-auth-library-oauth2-http:0.7.0') {
+    implementation ('com.google.auth:google-auth-library-oauth2-http:0.15.0') {
         exclude module: 'httpclient'
     }
 
     // Tests
-    testCompile 'junit:junit:4.12'
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
 task copySecretKey(type: Copy) {
diff --git a/speech/Speech/build.gradle b/speech/Speech/build.gradle
index 75f079d1..c503551c 100644
--- a/speech/Speech/build.gradle
+++ b/speech/Speech/build.gradle
@@ -18,12 +18,12 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
-        maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
+        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -32,8 +32,8 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
-        maven { url 'https://maven.google.com' }
     }
 }
 
diff --git a/speech/Speech/gradle/wrapper/gradle-wrapper.properties b/speech/Speech/gradle/wrapper/gradle-wrapper.properties
index 618ded6a..dd08a673 100644
--- a/speech/Speech/gradle/wrapper/gradle-wrapper.properties
+++ b/speech/Speech/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 03 14:01:53 JST 2017
+#Fri Apr 26 13:33:27 ICT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip