Fix 2.5.0 lint errors
- Publish IMA extension - Force IMA to use the correct version of the support library - Add missing sr translations for repeat mode strings ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=163705883
This commit is contained in:
parent
516762946d
commit
957158b7ff
@ -14,6 +14,12 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(modulePrefix + 'library-core')
|
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:
|
||||||
|
// com.google.android.gms:play-services-ads:11.0.2
|
||||||
|
// |-- com.google.android.gms:play-services-ads-lite:[11.0.2] -> 11.0.2
|
||||||
|
// |-- com.google.android.gms:play-services-basement:[11.0.2] -> 11.0.2
|
||||||
|
// |-- com.android.support:support-v4:25.2.0
|
||||||
compile 'com.android.support:support-annotations:' + supportLibraryVersion
|
compile 'com.android.support:support-annotations:' + supportLibraryVersion
|
||||||
compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
|
compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
|
||||||
compile 'com.google.android.gms:play-services-ads:11.0.2'
|
compile 'com.google.android.gms:play-services-ads:11.0.2'
|
||||||
@ -23,3 +29,14 @@ dependencies {
|
|||||||
androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion
|
androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion
|
||||||
androidTestCompile 'com.android.support.test:runner:' + testSupportLibraryVersion
|
androidTestCompile 'com.android.support.test:runner:' + testSupportLibraryVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ext {
|
||||||
|
javadocTitle = 'IMA extension'
|
||||||
|
}
|
||||||
|
apply from: '../../javadoc_library.gradle'
|
||||||
|
|
||||||
|
ext {
|
||||||
|
releaseArtifact = 'extension-ima'
|
||||||
|
releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
|
||||||
|
}
|
||||||
|
apply from: '../../publish.gradle'
|
||||||
|
@ -64,7 +64,7 @@ public final class MediaCodecInfo {
|
|||||||
/**
|
/**
|
||||||
* Whether the decoder is secure.
|
* Whether the decoder is secure.
|
||||||
*
|
*
|
||||||
* @see CodecCapabilities#isFeatureRequired(String)
|
* @see CodecCapabilities#isFeatureSupported(String)
|
||||||
* @see CodecCapabilities#FEATURE_SecurePlayback
|
* @see CodecCapabilities#FEATURE_SecurePlayback
|
||||||
*/
|
*/
|
||||||
public final boolean secure;
|
public final boolean secure;
|
||||||
|
@ -22,4 +22,7 @@
|
|||||||
<string name="exo_controls_stop_description">"Заустави"</string>
|
<string name="exo_controls_stop_description">"Заустави"</string>
|
||||||
<string name="exo_controls_rewind_description">"Премотај уназад"</string>
|
<string name="exo_controls_rewind_description">"Премотај уназад"</string>
|
||||||
<string name="exo_controls_fastforward_description">"Премотај унапред"</string>
|
<string name="exo_controls_fastforward_description">"Премотај унапред"</string>
|
||||||
|
<string name="exo_controls_repeat_all_description">"Понови све"</string>
|
||||||
|
<string name="exo_controls_repeat_off_description">"Понављање је искључено"</string>
|
||||||
|
<string name="exo_controls_repeat_one_description">"Понови једну"</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user