From 3ad6afbdca2293c8b61a9ef5f093b3aa5331add6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= Date: Mon, 21 Jan 2019 09:46:43 +0100 Subject: [PATCH] Fix libraries version --- build.gradle | 11 ++++++----- libvlc/build.gradle | 2 +- tools/build.gradle | 1 - vlc-android/build.gradle | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 71285eba2..20c9175c1 100644 --- a/build.gradle +++ b/build.gradle @@ -36,17 +36,18 @@ ext { compileSdkVersion = 28 androidxCoreVersion = '1.0.1' androidxVersion = '1.0.0' + androidxAnnotationVersion = '1.0.1' androidxAppcompatVersion = '1.0.2' - constraintLayoutVersion = '2.0.0-alpha3' + constraintLayoutVersion = '1.1.3' archVersion = '2.0.0' - roomVersion = '2.1.0-alpha03' - pagingVersion = '2.1.0-rc01' + roomVersion = '2.0.0' + pagingVersion = '2.0.0' junitVersion = '4.12' mockito = '2.8.9' powerMock = '1.7.4' retrofit = '2.4.0' - espressoVersion = '3.1.0-beta02' - supportTest = '1.1.0-beta02' + espressoVersion = '3.1.1' + supportTest = '1.1.0' // versionCode scheme is T M NN RR AA // T: Target/Flavour (1 for Android, 2 for Chrome?) // M: Major version from 0 to 9 diff --git a/libvlc/build.gradle b/libvlc/build.gradle index f6b6fd1f5..81862807a 100644 --- a/libvlc/build.gradle +++ b/libvlc/build.gradle @@ -60,7 +60,7 @@ clean { } dependencies { - api "androidx.annotation:annotation:$rootProject.ext.androidxVersion" + api "androidx.annotation:annotation:$rootProject.ext.androidxAnnotationVersion" api "androidx.legacy:legacy-support-v4:$rootProject.ext.androidxVersion" } diff --git a/tools/build.gradle b/tools/build.gradle index 3038104ed..d3e6e016b 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -36,7 +36,6 @@ dependencies { testImplementation "junit:junit:$rootProject.ext.junitVersion" androidTestImplementation "androidx.test:runner:$rootProject.ext.supportTest" androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { mavenCentral() diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle index 700150408..f95aa94f1 100644 --- a/vlc-android/build.gradle +++ b/vlc-android/build.gradle @@ -214,7 +214,7 @@ dependencies { // AppCompat implementation "androidx.recyclerview:recyclerview:$rootProject.ext.androidxVersion" implementation "com.google.android.material:material:$rootProject.ext.androidxVersion" - implementation "androidx.annotation:annotation:$rootProject.ext.androidxVersion" + implementation "androidx.annotation:annotation:$rootProject.ext.androidxAnnotationVersion" implementation "androidx.preference:preference:$rootProject.ext.androidxVersion" implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"