Build: Update Gradle files

Test: gradle build

Change-Id: Id5b366a45a68df25992eeb80a50d7163b535850c

1 files changed, 22 insertions, 24 deletions

diff --git a/common/build.gradle b/common/build.gradle
index b7bc8865..f00ce76e 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -23,14 +23,18 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.google.protobuf'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     compileOptions() {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     defaultConfig {
         minSdkVersion 23
         resConfigs "en"
@@ -58,6 +62,9 @@ android {
         main {
             res.srcDirs = ['res']
             java.srcDirs = ['src']
+            java {
+                exclude '**/BuildConfig.java'
+            }
             manifest.srcFile 'AndroidManifest.xml'
             proto {
                 srcDir 'src/com/android/tv/common/compat/internal'
@@ -71,10 +78,10 @@ android {
 
 dependencies {
     implementation      'androidx.annotation:annotation:1.1.0'
-    implementation      'androidx.appcompat:appcompat:1.0.2'
+    implementation      'androidx.appcompat:appcompat:1.1.0'
     implementation      'androidx.leanback:leanback:1.1.0-alpha02'
     implementation      'androidx.palette:palette:1.0.0'
-    implementation      'androidx.recyclerview:recyclerview:1.0.0'
+    implementation      'androidx.recyclerview:recyclerview:1.1.0'
     implementation      'androidx.recyclerview:recyclerview-selection:1.0.0'
     implementation      'androidx.tvprovider:tvprovider:1.0.0'
 
@@ -86,30 +93,21 @@ dependencies {
     implementation      'com.google.dagger:dagger-android:2.23'
     annotationProcessor 'com.google.dagger:dagger-android-processor:2.23'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.23'
-    implementation      'com.google.guava:guava:28.0-jre'
-    implementation      'com.google.protobuf:protobuf-java:3.0.0'
+    implementation      'com.google.guava:guava:28.1-jre'
+    implementation      'com.google.protobuf:protobuf-javalite:3.11.0'
 }
+
 protobuf {
-    // Configure the protoc executable
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0'
-
-        plugins {
-            javalite {
-                // The codegen for lite comes as a separate artifact
-                artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
-            }
-        }
-
-        generateProtoTasks {
-            all().each {
-                task -> task.builtins {
-                    remove java
-                }
-                task.plugins {
-                    javalite {}
+        artifact = 'com.google.protobuf:protoc:3.11.0'
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
                 }
             }
         }
     }
-}
\ No newline at end of file
+}