diff --git a/build.gradle b/build.gradle index 63a5f5eaaa..9c83e045db 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,14 @@ allprojects { // components provided by the library may be of use on older devices. // However, please note that the core media playback functionality // provided by the library requires API level 16 or greater. - minSdkVersion=9 - compileSdkVersion=25 - targetSdkVersion=25 - buildToolsVersion='25' + minSdkVersion = 9 + compileSdkVersion = 25 + targetSdkVersion = 25 + buildToolsVersion = '25' + testSupportLibraryVersion = '0.5' + supportLibraryVersion = '25.3.1' + dexmakerVersion = '1.2' + mockitoVersion = '1.9.5' releaseRepoName = getBintrayRepo() releaseUserOrg = 'google' releaseGroupId = 'com.google.android.exoplayer' diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index 5e3c2ab482..5611817b2e 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -33,11 +33,11 @@ dependencies { compile files('libs/cronet_api.jar') compile files('libs/cronet_impl_common_java.jar') compile files('libs/cronet_impl_native_java.jar') - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'org.mockito:mockito-core:1.9.5' androidTestCompile project(':library') - androidTestCompile 'com.android.support.test:runner:0.5' + 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 } ext { diff --git a/library/all/build.gradle b/library/all/build.gradle index e88ee2721d..63943ada77 100644 --- a/library/all/build.gradle +++ b/library/all/build.gradle @@ -11,8 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -import com.android.builder.core.BuilderConstants - apply plugin: 'com.android.library' android { diff --git a/library/core/build.gradle b/library/core/build.gradle index 8ab63af26f..bb0adaa4c7 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -36,10 +36,10 @@ android { } dependencies { - compile 'com.android.support:support-annotations:25.2.0' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'org.mockito:mockito-core:1.9.5' + compile 'com.android.support:support-annotations:' + supportLibraryVersion + androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion + androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion } ext { diff --git a/library/dash/build.gradle b/library/dash/build.gradle index e608181fab..ebad5a8603 100644 --- a/library/dash/build.gradle +++ b/library/dash/build.gradle @@ -37,11 +37,11 @@ android { dependencies { compile project(':library-core') - compile 'com.android.support:support-annotations:25.2.0' - compile 'com.android.support:support-core-utils:25.2.0' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'org.mockito:mockito-core:1.9.5' + compile 'com.android.support:support-annotations:' + supportLibraryVersion + compile 'com.android.support:support-core-utils:' + supportLibraryVersion + androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion + androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion } ext { diff --git a/library/hls/build.gradle b/library/hls/build.gradle index e7375fbc8e..47b5758b1d 100644 --- a/library/hls/build.gradle +++ b/library/hls/build.gradle @@ -31,10 +31,10 @@ android { dependencies { compile project(':library-core') - compile 'com.android.support:support-annotations:25.2.0' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'org.mockito:mockito-core:1.9.5' + compile 'com.android.support:support-annotations:' + supportLibraryVersion + androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion + androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion } ext { diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle index 1f76f1043d..81f8234672 100644 --- a/library/smoothstreaming/build.gradle +++ b/library/smoothstreaming/build.gradle @@ -37,10 +37,10 @@ android { dependencies { compile project(':library-core') - compile 'com.android.support:support-annotations:25.2.0' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'org.mockito:mockito-core:1.9.5' + compile 'com.android.support:support-annotations:' + supportLibraryVersion + androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion + androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion } ext { diff --git a/library/ui/build.gradle b/library/ui/build.gradle index 9e1e0ba85a..96dcd52655 100644 --- a/library/ui/build.gradle +++ b/library/ui/build.gradle @@ -31,7 +31,7 @@ android { dependencies { compile project(':library-core') - compile 'com.android.support:support-annotations:25.2.0' + compile 'com.android.support:support-annotations:' + supportLibraryVersion } ext { diff --git a/testutils/build.gradle b/testutils/build.gradle index a97c743384..f1d557bbf5 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -25,5 +25,5 @@ android { dependencies { compile project(':library') - compile 'org.mockito:mockito-core:1.9.5' + compile 'org.mockito:mockito-core:' + mockitoVersion }