From 4507c6870deec9715802d31e433b2756bcaaae59 Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 23 Apr 2019 15:09:57 +0100 Subject: [PATCH] Move away from AndroidX bundled Truth to be closer to head revision. The AndroidX bundled version (0.42) lags behind the most up-to-date public release (0.44) making it more difficult to stay close to the actual head revision which is used internally. PiperOrigin-RevId: 244848568 --- constants.gradle | 1 + extensions/vp9/build.gradle | 2 +- library/core/build.gradle | 4 ++-- testutils/build.gradle | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/constants.gradle b/constants.gradle index fd61b6f08e..0e668d2464 100644 --- a/constants.gradle +++ b/constants.gradle @@ -25,6 +25,7 @@ project.ext { autoServiceVersion = '1.0-rc4' checkerframeworkVersion = '2.5.0' androidXTestVersion = '1.1.0' + truthVersion = '0.44' modulePrefix = ':' if (gradle.ext.has('exoplayerModulePrefix')) { modulePrefix += gradle.ext.exoplayerModulePrefix diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 02b68b831d..fe1f220af6 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -43,7 +43,7 @@ dependencies { testImplementation project(modulePrefix + 'testutils-robolectric') androidTestImplementation 'androidx.test:runner:' + androidXTestVersion androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion - androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion + androidTestImplementation 'com.google.truth:truth:' + truthVersion } ext { diff --git a/library/core/build.gradle b/library/core/build.gradle index 68ff8cc977..f532ae0e6a 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -63,7 +63,7 @@ dependencies { compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion androidTestImplementation 'androidx.test:runner:' + androidXTestVersion androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion - androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion + androidTestImplementation 'com.google.truth:truth:' + truthVersion androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion @@ -71,7 +71,7 @@ dependencies { androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion testImplementation 'androidx.test:core:' + androidXTestVersion testImplementation 'androidx.test.ext:junit:' + androidXTestVersion - testImplementation 'androidx.test.ext:truth:' + androidXTestVersion + testImplementation 'com.google.truth:truth:' + truthVersion testImplementation 'org.mockito:mockito-core:' + mockitoVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion diff --git a/testutils/build.gradle b/testutils/build.gradle index bdc26d5c19..36465f5d5f 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -40,7 +40,7 @@ android { dependencies { api 'org.mockito:mockito-core:' + mockitoVersion api 'androidx.test.ext:junit:' + androidXTestVersion - api 'androidx.test.ext:truth:' + androidXTestVersion + api 'com.google.truth:truth:' + truthVersion implementation 'androidx.annotation:annotation:1.0.2' implementation project(modulePrefix + 'library-core') implementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion