railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

pre androidX, upgrade to 28

Browse Source
This commit is contained in:
vok 2019-06-21 09:32:51 +07:00
parent ed25b3f924
commit a203aeadea
7 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -125,19 +125,10 @@ project(':react-native-video').projectDir = new File(rootProject.projectDir, '..
dependencies { dependencies {
... ...
compile project(':react-native-video') compile project(':react-native-video')
+ implementation "androidx.appcompat:appcompat:1.0.0" implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
- implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
} }
``` ```
**android/gradle.properties**
Migrating to AndroidX:
```gradle.properties
android.useAndroidX=true
android.enableJetifier=true
```
**MainApplication.java** **MainApplication.java**

9
android-exoplayer/build.gradle
View File

@ -28,12 +28,9 @@ dependencies {
} }
// All support libs must use the same version // All support libs must use the same version
// implementation "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '+')}" implementation "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '28.0.0')}"
implementation "androidx.annotation:annotation:1.0.0" implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '28.0.0')}"
// implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}" implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '28.0.0')}"
implementation "androidx.core:core:1.0.0"
// implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "androidx.media:media:1.0.0"
implementation('com.google.android.exoplayer:extension-okhttp:2.9.3') { implementation('com.google.android.exoplayer:extension-okhttp:2.9.3') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp' exclude group: 'com.squareup.okhttp3', module: 'okhttp'

2
android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
View File

@ -2,7 +2,7 @@ package com.brentvatne.exoplayer;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import androidx.core.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;

2
android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java
View File

@ -1,6 +1,6 @@
package com.brentvatne.exoplayer; package com.brentvatne.exoplayer;
import androidx.annotation.IntDef; import android.support.annotation.IntDef;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
View File

@ -1,6 +1,6 @@
package com.brentvatne.exoplayer; package com.brentvatne.exoplayer;
import androidx.annotation.StringDef; import android.support.annotation.StringDef;
import android.view.View; import android.view.View;
import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Arguments;

3
examples/basic/android/app/build.gradle
View File

@ -132,8 +132,7 @@ android {
dependencies { dependencies {
implementation project(':react-native-video') implementation project(':react-native-video')
// compile "com.android.support:appcompat-v7:25.2.0" compile "com.android.support:appcompat-v7:28.0.0"
implementation "androidx.appcompat:appcompat:1.0.0"
implementation "com.facebook.react:react-native:+" // From node_modules implementation "com.facebook.react:react-native:+" // From node_modules
// implementation project(':react-native-video') // implementation project(':react-native-video')
// compile project(':react-native-video-exoplayer') // uncomment to use exoplayer // compile project(':react-native-video-exoplayer') // uncomment to use exoplayer

2
examples/basic/android/gradle.properties
View File

@ -18,5 +18,3 @@
# org.gradle.parallel=true # org.gradle.parallel=true
android.useDeprecatedNdk=true android.useDeprecatedNdk=true
android.useAndroidX=true
android.enableJetifier=true