From b3a7f8774f305c48e88b560999672fcff0630c9c Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Fri, 30 Jun 2017 04:12:29 -0700 Subject: [PATCH] Upgrade IMA dependencies and README ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160632943 --- extensions/ima/README.md | 5 ++--- extensions/ima/build.gradle | 15 ++------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/extensions/ima/README.md b/extensions/ima/README.md index 9ef37170d7..dd4603ef4e 100644 --- a/extensions/ima/README.md +++ b/extensions/ima/README.md @@ -36,9 +36,8 @@ section of the app. This is a preview version with some known issues: -* Midroll ads are not yet fully supported. `playAd` and `AD_STARTED` events are - sometimes delayed, meaning that midroll ads take a long time to start and the - ad overlay does not show immediately. * Tapping the 'More info' button on an ad in the demo app will pause the activity, which destroys the ImaAdsMediaSource. Played ad breaks will be shown to the user again if the demo app returns to the foreground. +* Ad loading timeouts are currently propagated as player errors, rather than + being silently handled by resuming content. diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index 3f95fcd414..b2dd2ab97b 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -15,19 +15,8 @@ android { dependencies { compile project(modulePrefix + 'library-core') compile 'com.android.support:support-annotations:' + supportLibraryVersion - compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.6.0' - compile 'com.google.android.gms:play-services-ads:10.2.4' - // There exists a dependency chain: - // com.google.android.gms:play-services-ads:10.2.4 - // |-> com.google.android.gms:play-services-ads-lite:10.2.4 - // |-> com.google.android.gms:play-services-basement:10.2.4 - // |-> com.android.support:support-v4:24.0.0 - // The support-v4:24.0.0 module directly includes older versions of the same - // classes as com.android.support:support-annotations. We need to manually - // force it to the version we're using to avoid a compilation failure. This - // will become unnecessary when the support-v4 dependency in the chain above - // has been updated to 24.2.0 or later. - 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:11.0.1' androidTestCompile project(modulePrefix + 'library') androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion