loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies + misc fixes

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=208195761
This commit is contained in:
olly 2018-08-10 05:24:30 -07:00 committed by Oliver Woodman
parent 2ed42409a7
commit bac597cb07
18 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -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

3
constants.gradle
View File

@ -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'

2
demos/cast/build.gradle
View File

@ -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'

2
demos/ima/build.gradle
View File

@ -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'

2
demos/main/build.gradle
View File

@ -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'

4
extensions/cast/build.gradle
View File

@ -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'
}

4
extensions/ima/build.gradle
View File

@ -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'
}

7
extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
View File

@ -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<UiElement> getUiElements() {
throw new UnsupportedOperationException();
}
@Override
public List<CompanionAd> getCompanionAds() {
throw new UnsupportedOperationException();
}
}

2
extensions/okhttp/build.gradle
View File

@ -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 {

2
library/core/src/main/java/com/google/android/exoplayer2/C.java
View File

@ -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,

8
library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
View File

@ -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 {

4
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
View File

@ -145,7 +145,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
* #setLoadErrorHandlingPolicy} for the default value.
*
* <p>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()}.
*
* <p>Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}.
*

4
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
View File

@ -93,7 +93,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
* #setLoadErrorHandlingPolicy} for the default value.
*
* <p>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()}.
*
* <p>Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}.
*

4
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java
View File

@ -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<String, List<String>> getResponseHeaders() {
return dataSource.getLastResponseHeaders();

4
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View File

@ -134,7 +134,7 @@ public final class DashMediaSource extends BaseMediaSource {
* #setLoadErrorHandlingPolicy} for the default value.
*
* <p>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()}.
*
* <p>Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}.
*

4
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View File

@ -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()}.
*
* <p>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}.
*
* <p>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.

4
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View File

@ -120,7 +120,7 @@ public final class SsMediaSource extends BaseMediaSource
* #setLoadErrorHandlingPolicy} for the default value.
*
* <p>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()}.
*
* <p>Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}.
*

8
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
View File

@ -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()}.
*
* <p>This method should typically be called in {@link Activity#onStart()} (or {@link
* Activity#onResume()} for API version <= 23).
* <p>This method should typically be called in {@link Activity#onStart()}, or {@link
* Activity#onResume()} for API versions &lt;= 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()}.
*
* <p>This method should typically be called in {@link Activity#onStop()} (or {@link
* Activity#onPause()} for API version <= 23).
* <p>This method should typically be called in {@link Activity#onStop()}, or {@link
* Activity#onPause()} for API versions &lt;= 23.
*/
public void onPause() {
if (surfaceView instanceof SphericalSurfaceView) {