[Android] Add KTX dependencies

Geoffrey Métais git at videolan.org
Tue Oct 29 15:27:33 CET 2019


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Oct 29 14:28:29 2019 +0100| [afe92e95ae8fb48099457ab3fd016162b757e714] | committer: Geoffrey Métais

Add KTX dependencies

> https://code.videolan.org/videolan/vlc-android/commit/afe92e95ae8fb48099457ab3fd016162b757e714
---

 build.gradle             | 9 +++++----
 vlc-android/build.gradle | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index cff3a1684..0c4fa7cf0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,18 +37,19 @@ ext {
     androidxLegacyVersion = '1.0.0'
     androidxCoreVersion = '1.1.0'
     lifecycleViewmodelVersion = '2.1.0'
+    lifecycleRuntimeVersion = '2.2.0-rc01'
     androidxPreferencesVersion = '1.1.0'
     androidxVersion = '1.1.0'
-    androidxActivityVersion = '1.0.0'
-    androidxFragmentVersion = '1.1.0'
+    androidxActivityVersion = '1.1.0-rc01'
+    androidxFragmentVersion = '1.2.0-rc01'
     androidxAnnotationVersion = '1.1.0'
     androidxAppcompatVersion = '1.1.0'
-    androidxRecyclerviewVersion = '1.0.0'
+    androidxRecyclerviewVersion = '1.1.0-rc01'
     androidxLeanbackVersion = '1.0.0'
     androidxMaterialVersion = '1.1.0-beta01'
     constraintLayoutVersion = '1.1.3'
     archVersion = '2.1.0'
-    roomVersion = '2.2.0'
+    roomVersion = '2.2.1'
     pagingVersion = '2.1.0'
     junitVersion = '4.12'
     mockito = '2.8.9'
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index ae5b1bb20..bf0060dea 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -21,6 +21,8 @@ android {
         preDexLibraries true
     }
 
+    kotlinOptions.jvmTarget = "1.8"
+
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     flavorDimensions "abi"
@@ -246,8 +248,8 @@ dependencies {
     implementation project(':tools')
 
     // AppCompat
-    implementation "androidx.activity:activity:$rootProject.ext.androidxActivityVersion"
-    implementation "androidx.fragment:fragment:$rootProject.ext.androidxFragmentVersion"
+    implementation "androidx.activity:activity-ktx:$rootProject.ext.androidxActivityVersion"
+    implementation "androidx.fragment:fragment-ktx:$rootProject.ext.androidxFragmentVersion"
     implementation "androidx.recyclerview:recyclerview:$rootProject.ext.androidxRecyclerviewVersion"
     implementation "com.google.android.material:material:$rootProject.ext.androidxMaterialVersion"
     implementation "androidx.annotation:annotation:$rootProject.ext.androidxAnnotationVersion"
@@ -256,6 +258,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.ext.archVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$rootProject.ext.lifecycleViewmodelVersion"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$rootProject.ext.lifecycleRuntimeVersion"
     kapt "androidx.lifecycle:lifecycle-compiler:$rootProject.ext.archVersion"
     implementation "androidx.room:room-runtime:$rootProject.ext.roomVersion"
     kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"



More information about the Android mailing list