diff options
author | Ridhim Rastogi <ridhim.rastogi@ittiam.com> | 2019-02-07 10:00:10 -0800 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2019-02-12 22:21:07 -0800 |
commit | f483121c6e138b051121b41af5c153ef47bda117 (patch) | |
tree | c08d71257c6a2a22e6525d011dbc0048049de4eb | |
parent | a13f62ff6a78b17486c501c944dccb9042c3d1b2 (diff) | |
download | TV-f483121c6e138b051121b41af5c153ef47bda117.tar.gz |
Update gradle build files for LiveTv
Uses SDK 28 to build, adds androidx and dagger dependency
Androidx refactor and SDK with System APIs are required
to build in Android Studio
Live Channels: Import of http://pa/6293979
Test: Import to Android Studio, refactor for Androidx, build
Change-Id: I4f826915a78cf6f10b59c03fdb60f04550fc560a
PiperOrigin-RevId: 232893741
-rw-r--r-- | build.gradle | 33 | ||||
-rw-r--r-- | common/build.gradle | 27 |
2 files changed, 37 insertions, 23 deletions
diff --git a/build.gradle b/build.gradle index 9a293671..23e3dbd1 100644 --- a/build.gradle +++ b/build.gradle @@ -26,18 +26,13 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.1.4' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.5' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6' } } apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '28.0.2' - lintOptions { - // check for lint errors in release builds, - // but continue the build even when errors are found: - abortOnError false - } + compileSdkVersion 28 + buildToolsVersion '28.0.3' dexOptions { preDexLibraries = false additionalParameters=['--core-library'] @@ -50,7 +45,7 @@ android { } defaultConfig { minSdkVersion 23 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -81,16 +76,24 @@ repositories { google() } -final String SUPPORT_LIBS_VERSION = '26.1.0' dependencies { - implementation "com.android.support:palette-v7:${SUPPORT_LIBS_VERSION}" - implementation "com.android.support:leanback-v17:${SUPPORT_LIBS_VERSION}" - implementation "com.android.support:support-tv-provider:${SUPPORT_LIBS_VERSION}" - /*Not building with latest one (1.6.2)*/ + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.leanback:leanback:1.0.0' + implementation "androidx.tvprovider:tvprovider:1.0.0" + implementation "androidx.recyclerview:recyclerview:1.0.0" + implementation "androidx.recyclerview:recyclerview-selection:1.0.0" + implementation "androidx.palette:palette:1.0.0" + + implementation 'com.google.dagger:dagger:2.18' + implementation 'com.google.dagger:dagger-android:2.18' + annotationProcessor 'com.google.dagger:dagger-compiler:2.18' + annotationProcessor 'com.google.dagger:dagger-android-processor:2.18' + + /*Not building with latest one (1.6.3)*/ annotationProcessor 'com.google.auto.value:auto-value:1.5.4' implementation 'com.google.auto.value:auto-value:1.5.4' implementation 'javax.inject:javax.inject:1' implementation 'com.google.guava:guava:26.0-android' implementation project(':common') - implementation project(':tuner') }
\ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 66f3b6e6..f3714758 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -28,11 +28,12 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6' } } android { - compileSdkVersion 26 - buildToolsVersion '28.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' dexOptions { preDexLibraries = false additionalParameters = ['--core-library'] @@ -47,18 +48,20 @@ android { defaultConfig { minSdkVersion 23 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" } buildTypes { debug { minifyEnabled false + buildConfigField "boolean", "AOSP", "true" buildConfigField "boolean", "ENG", "true" buildConfigField "boolean", "NO_JNI_TEST", "false" } release { minifyEnabled true + buildConfigField "boolean", "AOSP", "true" buildConfigField "boolean", "ENG", "false" buildConfigField "boolean", "NO_JNI_TEST", "false" } @@ -85,17 +88,25 @@ repositories { google() } -final String SUPPORT_LIBS_VERSION = '26.1.0' dependencies { - implementation "com.android.support:appcompat-v7:${SUPPORT_LIBS_VERSION}" - implementation "com.android.support:leanback-v17:${SUPPORT_LIBS_VERSION}" + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.leanback:leanback:1.0.0' + implementation "androidx.tvprovider:tvprovider:1.0.0" + implementation "androidx.recyclerview:recyclerview:1.0.0" + implementation "androidx.recyclerview:recyclerview-selection:1.0.0" + implementation "androidx.palette:palette:1.0.0" implementation 'com.google.guava:guava:26.0-android' - implementation 'com.google.protobuf:protobuf-java:3.6.1' + implementation 'com.google.protobuf:protobuf-java:3.0.0' + implementation 'com.google.dagger:dagger:2.18' + implementation 'com.google.dagger:dagger-android:2.18' + annotationProcessor 'com.google.dagger:dagger-compiler:2.18' + annotationProcessor 'com.google.dagger:dagger-android-processor:2.18' } protobuf { // Configure the protoc executable protoc { - artifact = 'com.google.protobuf:protoc:3.6.1' + artifact = 'com.google.protobuf:protoc:3.0.0' plugins { javalite { |