Skip to content

Commit

Permalink
Merge pull request #1219 from fiznool/fix/gradle3
Browse files Browse the repository at this point in the history
Support RN 0.57 w/ gradle 3
  • Loading branch information
cobarx authored Oct 14, 2018
2 parents 604250b + 051a2c3 commit d682a80
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions android-exoplayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ android {

dependencies {
//noinspection GradleDynamicVersion
provided "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
compile('com.google.android.exoplayer:exoplayer:2.8.4') {
compileOnly "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
implementation('com.google.android.exoplayer:exoplayer:2.8.4') {
exclude group: 'com.android.support'
}

// All support libs must use the same version
compile "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '+')}"
compile "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
compile "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '+')}"
implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"

compile('com.google.android.exoplayer:extension-okhttp:2.8.4') {
implementation('com.google.android.exoplayer:extension-okhttp:2.8.4') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
}
compile 'com.squareup.okhttp3:okhttp:3.11.0'
implementation 'com.squareup.okhttp3:okhttp:3.11.0'

}
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
//noinspection GradleDynamicVersion
provided "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
compile 'com.yqritc:android-scalablevideoview:1.0.4'
compileOnly "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
implementation 'com.yqritc:android-scalablevideoview:1.0.4'
}

0 comments on commit d682a80

Please sign in to comment.