From fcb796a80cd717f8797957b0187df44d2347ab3e Mon Sep 17 00:00:00 2001 From: hoangtc Date: Wed, 28 Feb 2018 05:24:42 -0800 Subject: [PATCH] Migrate ExoPlayer Gradle build files. - Change 'compile' configuration (deprecared) to using 'implementation' and 'api' configurations instead. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=187311778 --- RELEASENOTES.md | 6 ++++++ demos/cast/build.gradle | 16 +++++++++------- demos/ima/build.gradle | 13 +++++++------ demos/main/build.gradle | 23 ++++++++++++----------- extensions/cast/README.md | 2 +- extensions/cast/build.gradle | 25 +++++++++++++++---------- extensions/cronet/build.gradle | 13 +++++++------ extensions/ffmpeg/build.gradle | 2 +- extensions/flac/build.gradle | 4 ++-- extensions/gvr/README.md | 2 +- extensions/gvr/build.gradle | 4 ++-- extensions/ima/README.md | 2 +- extensions/ima/build.gradle | 13 ++++--------- extensions/jobdispatcher/README.md | 2 +- extensions/jobdispatcher/build.gradle | 4 ++-- extensions/leanback/README.md | 2 +- extensions/leanback/build.gradle | 4 ++-- extensions/mediasession/README.md | 2 +- extensions/mediasession/build.gradle | 4 ++-- extensions/okhttp/README.md | 2 +- extensions/okhttp/build.gradle | 5 +++-- extensions/opus/build.gradle | 2 +- extensions/rtmp/README.md | 2 +- extensions/rtmp/build.gradle | 5 +++-- extensions/vp9/build.gradle | 5 +++-- library/all/build.gradle | 10 +++++----- library/core/build.gradle | 18 +++++++++--------- library/dash/build.gradle | 6 +++--- library/hls/build.gradle | 6 +++--- library/smoothstreaming/build.gradle | 6 +++--- library/ui/build.gradle | 4 ++-- playbacktests/build.gradle | 8 ++++---- testutils/build.gradle | 9 +++++---- testutils_robolectric/build.gradle | 6 ++++-- 34 files changed, 127 insertions(+), 110 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4498093717..2af5d134d6 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -2,6 +2,12 @@ ### dev-v2 (not yet released) ### +* Gradle: Replace 'compile' configuration (deprecated) with 'implementation' and + 'api'. Note: This may lead to build breakage for applications upgrading from + previous version that rely on indirect dependency for certain modules. In such + cases, application developers need to add the missing dependency directly to + resolve this issue. You can read more about the new dependency configurations + [here](https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#new_configurations). * Downloading: Add `DownloadService`, `DownloadManager` and related classes ([#2643](https://github.com/google/ExoPlayer/issues/2643)). * MediaSources: diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle index 8f074c9238..9bf62c8fc3 100644 --- a/demos/cast/build.gradle +++ b/demos/cast/build.gradle @@ -42,11 +42,13 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile project(modulePrefix + 'library-dash') - compile project(modulePrefix + 'library-hls') - compile project(modulePrefix + 'library-smoothstreaming') - compile project(modulePrefix + 'library-ui') - compile project(modulePrefix + 'extension-cast') - compile 'com.android.support:recyclerview-v7:' + supportLibraryVersion + implementation project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-dash') + implementation project(modulePrefix + 'library-hls') + implementation project(modulePrefix + 'library-smoothstreaming') + implementation project(modulePrefix + 'library-ui') + implementation project(modulePrefix + 'extension-cast') + implementation 'com.android.support:support-v4:' + supportLibraryVersion + implementation 'com.android.support:appcompat-v7:' + supportLibraryVersion + implementation 'com.android.support:recyclerview-v7:' + supportLibraryVersion } diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle index 5225c260f8..710e878d14 100644 --- a/demos/ima/build.gradle +++ b/demos/ima/build.gradle @@ -41,10 +41,11 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile project(modulePrefix + 'library-ui') - compile project(modulePrefix + 'library-dash') - compile project(modulePrefix + 'library-hls') - compile project(modulePrefix + 'library-smoothstreaming') - compile project(modulePrefix + 'extension-ima') + implementation project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-ui') + implementation project(modulePrefix + 'library-dash') + implementation project(modulePrefix + 'library-hls') + implementation project(modulePrefix + 'library-smoothstreaming') + implementation project(modulePrefix + 'extension-ima') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion } diff --git a/demos/main/build.gradle b/demos/main/build.gradle index f637e39ce4..5b199faf7a 100644 --- a/demos/main/build.gradle +++ b/demos/main/build.gradle @@ -55,15 +55,16 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile project(modulePrefix + 'library-dash') - compile project(modulePrefix + 'library-hls') - compile project(modulePrefix + 'library-smoothstreaming') - compile project(modulePrefix + 'library-ui') - withExtensionsCompile project(path: modulePrefix + 'extension-ffmpeg') - withExtensionsCompile project(path: modulePrefix + 'extension-flac') - withExtensionsCompile project(path: modulePrefix + 'extension-ima') - withExtensionsCompile project(path: modulePrefix + 'extension-opus') - withExtensionsCompile project(path: modulePrefix + 'extension-vp9') - withExtensionsCompile project(path: modulePrefix + 'extension-rtmp') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + implementation project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-dash') + implementation project(modulePrefix + 'library-hls') + implementation project(modulePrefix + 'library-smoothstreaming') + implementation project(modulePrefix + 'library-ui') + withExtensionsImplementation project(path: modulePrefix + 'extension-ffmpeg') + withExtensionsImplementation project(path: modulePrefix + 'extension-flac') + withExtensionsImplementation project(path: modulePrefix + 'extension-ima') + withExtensionsImplementation project(path: modulePrefix + 'extension-opus') + withExtensionsImplementation project(path: modulePrefix + 'extension-vp9') + withExtensionsImplementation project(path: modulePrefix + 'extension-rtmp') } diff --git a/extensions/cast/README.md b/extensions/cast/README.md index 8666690661..a0c34236c6 100644 --- a/extensions/cast/README.md +++ b/extensions/cast/README.md @@ -12,7 +12,7 @@ Cast receiver app. The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-cast:rX.X.X' +implementation 'com.google.android.exoplayer:extension-cast:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index 2f79c7a0ee..253a1922a8 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.gradle @@ -26,19 +26,24 @@ android { } dependencies { - // This dependency is necessary to force the supportLibraryVersion of - // com.android.support:support-v4 to be used. Else an older version (25.2.0) - // is included via: + // These dependencies are necessary to force the supportLibraryVersion of + // com.android.support:support-v4, com.android.support:appcompat-v7 and + // com.android.support:mediarouter-v7 to be used. Else older versions are + // used, for example: // com.google.android.gms:play-services-cast-framework:11.4.2 // |-- com.google.android.gms:play-services-basement:11.4.2 // |-- com.android.support:support-v4:25.2.0 - compile 'com.android.support:support-v4:' + supportLibraryVersion - compile 'com.android.support:appcompat-v7:' + supportLibraryVersion - compile 'com.android.support:mediarouter-v7:' + supportLibraryVersion - compile 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion - compile project(modulePrefix + 'library-core') - compile project(modulePrefix + 'library-ui') - testCompile project(modulePrefix + 'testutils-robolectric') + api 'com.android.support:support-v4:' + supportLibraryVersion + api 'com.android.support:appcompat-v7:' + supportLibraryVersion + api 'com.android.support:mediarouter-v7:' + supportLibraryVersion + api 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion + implementation project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-ui') + testImplementation project(modulePrefix + 'testutils') + testImplementation 'junit:junit:' + junitVersion + testImplementation 'org.mockito:mockito-core:' + mockitoVersion + testImplementation 'org.robolectric:robolectric:' + robolectricVersion + testImplementation project(modulePrefix + 'testutils-robolectric') } ext { diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index 2d25c7299c..1cfb4f5513 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -35,12 +35,13 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile files('libs/cronet_api.jar') - compile files('libs/cronet_impl_common_java.jar') - compile files('libs/cronet_impl_native_java.jar') - testCompile project(modulePrefix + 'library') - testCompile project(modulePrefix + 'testutils-robolectric') + api files('libs/cronet_api.jar') + implementation files('libs/cronet_impl_common_java.jar') + implementation files('libs/cronet_impl_native_java.jar') + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + testImplementation project(modulePrefix + 'library') + testImplementation project(modulePrefix + 'testutils-robolectric') } ext { diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index 9820818f3e..e2d3a08e36 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.gradle @@ -31,7 +31,7 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-core') } ext { diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index 4d840d34ac..f617064ce5 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.gradle @@ -31,8 +31,8 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - androidTestCompile project(modulePrefix + 'testutils') + implementation project(modulePrefix + 'library-core') + androidTestImplementation project(modulePrefix + 'testutils') } ext { diff --git a/extensions/gvr/README.md b/extensions/gvr/README.md index 250cf58c2f..f5a52d3162 100644 --- a/extensions/gvr/README.md +++ b/extensions/gvr/README.md @@ -12,7 +12,7 @@ of surround sound and ambisonic soundfields. The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-gvr:rX.X.X' +implementation 'com.google.android.exoplayer:extension-gvr:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle index 8236024512..f146ba4df6 100644 --- a/extensions/gvr/build.gradle +++ b/extensions/gvr/build.gradle @@ -25,8 +25,8 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'com.google.vr:sdk-audio:1.80.0' + implementation project(modulePrefix + 'library-core') + implementation 'com.google.vr:sdk-audio:1.80.0' } ext { diff --git a/extensions/ima/README.md b/extensions/ima/README.md index a796ca8694..208d64fe71 100644 --- a/extensions/ima/README.md +++ b/extensions/ima/README.md @@ -12,7 +12,7 @@ alongside content. The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-ima:rX.X.X' +implementation 'com.google.android.exoplayer:extension-ima:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index 5038aaf5b9..3a20e378ae 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -26,7 +26,6 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') // This dependency is necessary to force the supportLibraryVersion of // com.android.support:support-v4 to be used. Else an older version (25.2.0) // is included via: @@ -34,14 +33,10 @@ dependencies { // |-- com.google.android.gms:play-services-ads-lite:11.4.2 // |-- com.google.android.gms:play-services-basement:11.4.2 // |-- com.android.support:support-v4:25.2.0 - compile 'com.android.support:support-v4:' + supportLibraryVersion - compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4' - compile 'com.google.android.gms:play-services-ads:' + playServicesLibraryVersion - androidTestCompile project(modulePrefix + 'library') - androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion - androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion - androidTestCompile 'com.android.support.test:runner:' + testSupportLibraryVersion + api 'com.android.support:support-v4:' + supportLibraryVersion + api 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4' + implementation project(modulePrefix + 'library-core') + implementation 'com.google.android.gms:play-services-ads:' + playServicesLibraryVersion } ext { diff --git a/extensions/jobdispatcher/README.md b/extensions/jobdispatcher/README.md index d9efc77012..146aa3ca55 100644 --- a/extensions/jobdispatcher/README.md +++ b/extensions/jobdispatcher/README.md @@ -9,7 +9,7 @@ This extension provides a Scheduler implementation which uses [Firebase JobDispa The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-jobdispatcher:rX.X.X' +implementation 'com.google.android.exoplayer:extension-jobdispatcher:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/jobdispatcher/build.gradle b/extensions/jobdispatcher/build.gradle index fd5fce9ec8..f4a8751c67 100644 --- a/extensions/jobdispatcher/build.gradle +++ b/extensions/jobdispatcher/build.gradle @@ -27,8 +27,8 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'com.firebase:firebase-jobdispatcher:0.8.5' + implementation project(modulePrefix + 'library-core') + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' } ext { diff --git a/extensions/leanback/README.md b/extensions/leanback/README.md index 1fa71c9a8c..e9a0e6fbc4 100644 --- a/extensions/leanback/README.md +++ b/extensions/leanback/README.md @@ -11,7 +11,7 @@ ExoPlayer. The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-leanback:rX.X.X' +implementation 'com.google.android.exoplayer:extension-leanback:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle index d8952ca2b8..dc187a5709 100644 --- a/extensions/leanback/build.gradle +++ b/extensions/leanback/build.gradle @@ -25,8 +25,8 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile('com.android.support:leanback-v17:' + supportLibraryVersion) + implementation project(modulePrefix + 'library-core') + implementation('com.android.support:leanback-v17:' + supportLibraryVersion) } ext { diff --git a/extensions/mediasession/README.md b/extensions/mediasession/README.md index 3278e8dba5..f89b27f0b4 100644 --- a/extensions/mediasession/README.md +++ b/extensions/mediasession/README.md @@ -12,7 +12,7 @@ behaviour can be extended to support other playback and custom actions. The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-mediasession:rX.X.X' +implementation 'com.google.android.exoplayer:extension-mediasession:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle index 651bd952f8..eaaf078b5c 100644 --- a/extensions/mediasession/build.gradle +++ b/extensions/mediasession/build.gradle @@ -25,8 +25,8 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'com.android.support:support-media-compat:' + supportLibraryVersion + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-media-compat:' + supportLibraryVersion } ext { diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md index e40535d4e8..1469b6cd51 100644 --- a/extensions/okhttp/README.md +++ b/extensions/okhttp/README.md @@ -19,7 +19,7 @@ licensed separately. The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-okhttp:rX.X.X' +implementation 'com.google.android.exoplayer:extension-okhttp:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 13bcff8a4e..2da245b1a5 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -30,8 +30,9 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile('com.squareup.okhttp3:okhttp:3.9.0') { + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + implementation('com.squareup.okhttp3:okhttp:3.9.0') { exclude group: 'org.json' } } diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index 41b428070f..2d20c65697 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.gradle @@ -31,7 +31,7 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-core') } ext { diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md index fb822b8326..cf7edd7643 100644 --- a/extensions/rtmp/README.md +++ b/extensions/rtmp/README.md @@ -20,7 +20,7 @@ Android, which is licensed separately. The easiest way to use the extension is to add it as a gradle dependency: ```gradle -compile 'com.google.android.exoplayer:extension-rtmp:rX.X.X' +implementation 'com.google.android.exoplayer:extension-rtmp:rX.X.X' ``` where `rX.X.X` is the version, which must match the version of the ExoPlayer diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle index 2afa4a4ea7..c34e0b9999 100644 --- a/extensions/rtmp/build.gradle +++ b/extensions/rtmp/build.gradle @@ -25,8 +25,9 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'net.butterflytv.utils:rtmp-client:3.0.1' + implementation project(modulePrefix + 'library-core') + implementation 'net.butterflytv.utils:rtmp-client:3.0.1' + implementation 'com.android.support:support-annotations:' + supportLibraryVersion } ext { diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 3d68e1428f..7dc95b388f 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -31,8 +31,9 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - androidTestCompile 'com.google.truth:truth:' + truthVersion + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + androidTestImplementation 'com.google.truth:truth:' + truthVersion } ext { diff --git a/library/all/build.gradle b/library/all/build.gradle index 79ed9c747b..bb832ba0ff 100644 --- a/library/all/build.gradle +++ b/library/all/build.gradle @@ -25,11 +25,11 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile project(modulePrefix + 'library-dash') - compile project(modulePrefix + 'library-hls') - compile project(modulePrefix + 'library-smoothstreaming') - compile project(modulePrefix + 'library-ui') + api project(modulePrefix + 'library-core') + api project(modulePrefix + 'library-dash') + api project(modulePrefix + 'library-hls') + api project(modulePrefix + 'library-smoothstreaming') + api project(modulePrefix + 'library-ui') } ext { diff --git a/library/core/build.gradle b/library/core/build.gradle index 3d655ba543..fe6045c2e7 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -45,15 +45,15 @@ android { } dependencies { - compile 'com.android.support:support-annotations:' + supportLibraryVersion - androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion - androidTestCompile 'com.google.truth:truth:' + truthVersion - androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion - testCompile 'com.google.truth:truth:' + truthVersion - testCompile 'junit:junit:' + junitVersion - testCompile 'org.mockito:mockito-core:' + mockitoVersion - testCompile 'org.robolectric:robolectric:' + robolectricVersion + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion + androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion + androidTestImplementation 'com.google.truth:truth:' + truthVersion + androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion + testImplementation 'com.google.truth:truth:' + truthVersion + testImplementation 'junit:junit:' + junitVersion + testImplementation 'org.mockito:mockito-core:' + mockitoVersion + testImplementation 'org.robolectric:robolectric:' + robolectricVersion } ext { diff --git a/library/dash/build.gradle b/library/dash/build.gradle index 6cf6f64443..d2692eb7d9 100644 --- a/library/dash/build.gradle +++ b/library/dash/build.gradle @@ -33,9 +33,9 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'com.android.support:support-annotations:' + supportLibraryVersion - testCompile project(modulePrefix + 'testutils-robolectric') + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + testImplementation project(modulePrefix + 'testutils-robolectric') } ext { diff --git a/library/hls/build.gradle b/library/hls/build.gradle index 41e0b71da2..c2268a3007 100644 --- a/library/hls/build.gradle +++ b/library/hls/build.gradle @@ -33,9 +33,9 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'com.android.support:support-annotations:' + supportLibraryVersion - testCompile project(modulePrefix + 'testutils-robolectric') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + implementation project(modulePrefix + 'library-core') + testImplementation project(modulePrefix + 'testutils-robolectric') } ext { diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle index b85f25e656..6ca5570a93 100644 --- a/library/smoothstreaming/build.gradle +++ b/library/smoothstreaming/build.gradle @@ -33,9 +33,9 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'com.android.support:support-annotations:' + supportLibraryVersion - testCompile project(modulePrefix + 'testutils-robolectric') + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + testImplementation project(modulePrefix + 'testutils-robolectric') } ext { diff --git a/library/ui/build.gradle b/library/ui/build.gradle index 89734ed806..9689fcef97 100644 --- a/library/ui/build.gradle +++ b/library/ui/build.gradle @@ -33,8 +33,8 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'com.android.support:support-annotations:' + supportLibraryVersion + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion } ext { diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle index 6cd56868f9..d5d524b5a5 100644 --- a/playbacktests/build.gradle +++ b/playbacktests/build.gradle @@ -25,8 +25,8 @@ android { } dependencies { - androidTestCompile project(modulePrefix + 'library-core') - androidTestCompile project(modulePrefix + 'library-dash') - androidTestCompile project(modulePrefix + 'library-hls') - androidTestCompile project(modulePrefix + 'testutils') + androidTestImplementation project(modulePrefix + 'library-core') + androidTestImplementation project(modulePrefix + 'library-dash') + androidTestImplementation project(modulePrefix + 'library-hls') + androidTestImplementation project(modulePrefix + 'testutils') } diff --git a/testutils/build.gradle b/testutils/build.gradle index 11ec55c047..a7f05a2c5e 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -32,8 +32,9 @@ android { } dependencies { - compile project(modulePrefix + 'library-core') - compile 'org.mockito:mockito-core:' + mockitoVersion - compile 'com.google.truth:truth:' + truthVersion - testCompile project(modulePrefix + 'testutils-robolectric') + api 'org.mockito:mockito-core:' + mockitoVersion + api 'com.google.truth:truth:' + truthVersion + implementation 'com.android.support:support-annotations:' + supportLibraryVersion + implementation project(modulePrefix + 'library-core') + testImplementation project(modulePrefix + 'testutils-robolectric') } diff --git a/testutils_robolectric/build.gradle b/testutils_robolectric/build.gradle index f5a427a4b3..c221149c29 100644 --- a/testutils_robolectric/build.gradle +++ b/testutils_robolectric/build.gradle @@ -32,6 +32,8 @@ android { } dependencies { - compile project(modulePrefix + 'testutils') - compile 'org.robolectric:robolectric:' + robolectricVersion + api 'org.robolectric:robolectric:' + robolectricVersion + api project(modulePrefix + 'testutils') + implementation project(modulePrefix + 'library-core') + implementation 'com.android.support:support-annotations:' + supportLibraryVersion }