Merge branch 'master' into fix/gradle3

This commit is contained in:
Hampton Maxwell
2018-10-13 19:18:13 -07:00
committed by GitHub
28 changed files with 1063 additions and 340 deletions

View File

@@ -19,7 +19,7 @@ android {
dependencies {
//noinspection GradleDynamicVersion
compileOnly "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
implementation('com.google.android.exoplayer:exoplayer:2.8.2') {
implementation('com.google.android.exoplayer:exoplayer:2.8.4') {
exclude group: 'com.android.support'
}
@@ -28,7 +28,7 @@ dependencies {
implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
implementation('com.google.android.exoplayer:extension-okhttp:2.8.2') {
implementation('com.google.android.exoplayer:extension-okhttp:2.8.4') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
}
implementation 'com.squareup.okhttp3:okhttp:3.11.0'