From bac597cb076e79ed71cf4fe38dc35749c3a2074a Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 10 Aug 2018 05:24:30 -0700 Subject: [PATCH] Update dependencies + misc fixes ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=208195761 --- build.gradle | 3 ++- constants.gradle | 3 +-- demos/cast/build.gradle | 2 ++ demos/ima/build.gradle | 2 ++ demos/main/build.gradle | 2 ++ extensions/cast/build.gradle | 4 +++- extensions/ima/build.gradle | 4 +++- .../com/google/android/exoplayer2/ext/ima/FakeAd.java | 7 +++++++ extensions/okhttp/build.gradle | 2 +- .../src/main/java/com/google/android/exoplayer2/C.java | 2 +- .../android/exoplayer2/source/DeferredMediaPeriod.java | 8 ++++---- .../android/exoplayer2/source/ExtractorMediaSource.java | 4 ++-- .../exoplayer2/source/SingleSampleMediaSource.java | 4 ++-- .../com/google/android/exoplayer2/source/chunk/Chunk.java | 4 ++-- .../android/exoplayer2/source/dash/DashMediaSource.java | 4 ++-- .../android/exoplayer2/source/hls/HlsMediaSource.java | 4 ++-- .../exoplayer2/source/smoothstreaming/SsMediaSource.java | 4 ++-- .../java/com/google/android/exoplayer2/ui/PlayerView.java | 8 ++++---- 18 files changed, 44 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 3813a241e0..a013f4fb84 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,9 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.novoda:bintray-release:0.8.1' + classpath 'com.google.android.gms:strict-version-matcher-plugin:1.0.3' } // Workaround for the following test coverage issue. Remove when fixed: // https://code.google.com/p/android/issues/detail?id=226070 diff --git a/constants.gradle b/constants.gradle index c8130844e6..4511eb86df 100644 --- a/constants.gradle +++ b/constants.gradle @@ -24,8 +24,7 @@ project.ext { compileSdkVersion = 27 buildToolsVersion = '27.0.3' testSupportLibraryVersion = '0.5' - supportLibraryVersion = '27.0.0' - playServicesLibraryVersion = '15.0.1' + supportLibraryVersion = '27.1.1' dexmakerVersion = '1.2' mockitoVersion = '1.9.5' junitVersion = '4.12' diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle index fbd7c0488e..915bc10b7c 100644 --- a/demos/cast/build.gradle +++ b/demos/cast/build.gradle @@ -62,3 +62,5 @@ dependencies { implementation 'com.android.support:appcompat-v7:' + supportLibraryVersion implementation 'com.android.support:recyclerview-v7:' + supportLibraryVersion } + +apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle index 3f833b7569..33cca6ef46 100644 --- a/demos/ima/build.gradle +++ b/demos/ima/build.gradle @@ -56,3 +56,5 @@ dependencies { implementation project(modulePrefix + 'extension-ima') implementation 'com.android.support:support-annotations:' + supportLibraryVersion } + +apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' diff --git a/demos/main/build.gradle b/demos/main/build.gradle index 46c167c705..c516ba297f 100644 --- a/demos/main/build.gradle +++ b/demos/main/build.gradle @@ -75,3 +75,5 @@ dependencies { withExtensionsImplementation project(path: modulePrefix + 'extension-vp9') withExtensionsImplementation project(path: modulePrefix + 'extension-rtmp') } + +apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index 0af6fbbebd..35499f1c1d 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.gradle @@ -31,7 +31,7 @@ android { } dependencies { - api 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion + api 'com.google.android.gms:play-services-cast-framework:16.0.1' implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-ui') testImplementation project(modulePrefix + 'testutils') @@ -50,6 +50,8 @@ dependencies { api 'com.android.support:recyclerview-v7:' + supportLibraryVersion } +apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' + ext { javadocTitle = 'Cast extension' } diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index 75d688ab52..cf6938a2b1 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -33,7 +33,7 @@ android { dependencies { api 'com.google.ads.interactivemedia.v3:interactivemedia:3.9.4' implementation project(modulePrefix + 'library-core') - implementation 'com.google.android.gms:play-services-ads:' + playServicesLibraryVersion + implementation 'com.google.android.gms:play-services-ads:15.0.1' // These dependencies are necessary to force the supportLibraryVersion of // com.android.support:support-v4 and com.android.support:customtabs to be // used. Else older versions are used, for example via: @@ -48,6 +48,8 @@ dependencies { testImplementation project(modulePrefix + 'testutils-robolectric') } +apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' + ext { javadocTitle = 'IMA extension' } diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java index 284471adfc..873a1b1d09 100644 --- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java +++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java @@ -17,7 +17,9 @@ package com.google.android.exoplayer2.ext.ima; import com.google.ads.interactivemedia.v3.api.Ad; import com.google.ads.interactivemedia.v3.api.AdPodInfo; +import com.google.ads.interactivemedia.v3.api.CompanionAd; import com.google.ads.interactivemedia.v3.api.UiElement; +import java.util.List; import java.util.Set; /** A fake ad for testing. */ @@ -186,4 +188,9 @@ import java.util.Set; public Set getUiElements() { throw new UnsupportedOperationException(); } + + @Override + public List getCompanionAds() { + throw new UnsupportedOperationException(); + } } diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index fd1ebd28b5..4e6b11c495 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'com.android.support:support-annotations:' + supportLibraryVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - api 'com.squareup.okhttp3:okhttp:3.10.0' + api 'com.squareup.okhttp3:okhttp:3.11.0' } ext { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java index 29cbcd83e4..7d98b29ab0 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/C.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java @@ -375,7 +375,7 @@ public final class C { public static final int USAGE_VOICE_COMMUNICATION_SIGNALLING = android.media.AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING; - /** Audio focus types for {@link AudioFocusConfiguration}. */ + /** Audio focus types. */ @Retention(RetentionPolicy.SOURCE) @IntDef({ AUDIOFOCUS_NONE, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java index 0dc4b4c888..5f84731b8d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java @@ -24,10 +24,10 @@ import com.google.android.exoplayer2.upstream.Allocator; import java.io.IOException; /** - * Media period that wraps a media source and defers calling its - * {@link MediaSource#createPeriod(MediaPeriodId, Allocator)} method until {@link #createPeriod()} - * has been called. This is useful if you need to return a media period immediately but the media - * source that should create it is not yet prepared. + * Media period that wraps a media source and defers calling its {@link + * MediaSource#createPeriod(MediaPeriodId, Allocator)} method until {@link + * #createPeriod(MediaPeriodId)} has been called. This is useful if you need to return a media + * period immediately but the media source that should create it is not yet prepared. */ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callback { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java index a948b9d2aa..b8db9adde6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java @@ -145,7 +145,7 @@ public final class ExtractorMediaSource extends BaseMediaSource * #setLoadErrorHandlingPolicy} for the default value. * *

Calling this method is equivalent to calling {@link #setLoadErrorHandlingPolicy} with - * {@link DefaultLoadErrorHandlingPolicy(int) + * {@link DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy(int) * DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)} * * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. @@ -160,7 +160,7 @@ public final class ExtractorMediaSource extends BaseMediaSource /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link - * DefaultLoadErrorHandlingPolicy()}. + * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. * diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java index 7b4dd96e4a..24f49cb086 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java @@ -93,7 +93,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource { * #setLoadErrorHandlingPolicy} for the default value. * *

Calling this method is equivalent to calling {@link #setLoadErrorHandlingPolicy} with - * {@link DefaultLoadErrorHandlingPolicy (int) + * {@link DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy(int) * DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)} * * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. @@ -108,7 +108,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource { /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link - * DefaultLoadErrorHandlingPolicy()}. + * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. * diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java index 5c109aef8c..91c3afec80 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java @@ -119,7 +119,7 @@ public abstract class Chunk implements Loadable { * occurred, this is the redirected uri. Must only be called after the load completed, failed, or * was canceled. * - * @see DataSource#getUri(). + * @see DataSource#getUri() */ public final Uri getUri() { return dataSource.getLastOpenedUri(); @@ -129,7 +129,7 @@ public abstract class Chunk implements Loadable { * Returns the response headers associated with the last {@link DataSource#open} call. Must only * be called after the load completed, failed, or was canceled. * - * @see DataSource#getResponseHeaders(). + * @see DataSource#getResponseHeaders() */ public final Map> getResponseHeaders() { return dataSource.getLastResponseHeaders(); diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java index cc9651ad5c..ede757aed0 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java @@ -134,7 +134,7 @@ public final class DashMediaSource extends BaseMediaSource { * #setLoadErrorHandlingPolicy} for the default value. * *

Calling this method is equivalent to calling {@link #setLoadErrorHandlingPolicy} with - * {@link DefaultLoadErrorHandlingPolicy (int) + * {@link DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy(int) * DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)} * * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. @@ -149,7 +149,7 @@ public final class DashMediaSource extends BaseMediaSource { /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link - * DefaultLoadErrorHandlingPolicy()}. + * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. * diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index 6efa9728e9..0b69cd5fa8 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -125,7 +125,7 @@ public final class HlsMediaSource extends BaseMediaSource /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link - * DefaultLoadErrorHandlingPolicy()}. + * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. * @@ -147,7 +147,7 @@ public final class HlsMediaSource extends BaseMediaSource * {@link DefaultLoadErrorHandlingPolicy#DEFAULT_MIN_LOADABLE_RETRY_COUNT}. * *

Calling this method is equivalent to calling {@link #setLoadErrorHandlingPolicy} with - * {@link DefaultLoadErrorHandlingPolicy(int) + * {@link DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy(int) * DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)} * * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java index 03f64bfd38..1a80ade01d 100644 --- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java +++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java @@ -120,7 +120,7 @@ public final class SsMediaSource extends BaseMediaSource * #setLoadErrorHandlingPolicy} for the default value. * *

Calling this method is equivalent to calling {@link #setLoadErrorHandlingPolicy} with - * {@link DefaultLoadErrorHandlingPolicy(int) + * {@link DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy(int) * DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)} * * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. @@ -135,7 +135,7 @@ public final class SsMediaSource extends BaseMediaSource /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link - * DefaultLoadErrorHandlingPolicy()}. + * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. * diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java index b58fa182fa..6630abb2fb 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java @@ -990,8 +990,8 @@ public class PlayerView extends FrameLayout { * Should be called when the player is visible to the user and if {@code surface_type} is {@code * spherical_view}. It is the counterpart to {@link #onPause()}. * - *

This method should typically be called in {@link Activity#onStart()} (or {@link - * Activity#onResume()} for API version <= 23). + *

This method should typically be called in {@link Activity#onStart()}, or {@link + * Activity#onResume()} for API versions <= 23. */ public void onResume() { if (surfaceView instanceof SphericalSurfaceView) { @@ -1003,8 +1003,8 @@ public class PlayerView extends FrameLayout { * Should be called when the player is no longer visible to the user and if {@code surface_type} * is {@code spherical_view}. It is the counterpart to {@link #onResume()}. * - *

This method should typically be called in {@link Activity#onStop()} (or {@link - * Activity#onPause()} for API version <= 23). + *

This method should typically be called in {@link Activity#onStop()}, or {@link + * Activity#onPause()} for API versions <= 23. */ public void onPause() { if (surfaceView instanceof SphericalSurfaceView) {