From 8d8483d49647d87f4b3d4195585105caa2c19aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=81=93=E7=8E=84?= Date: Tue, 9 Jul 2019 14:14:34 +0800 Subject: [PATCH] rm rnpm & use androidX --- .../main/java/com/brentvatne/exoplayer/ExoPlayerView.java | 2 +- .../src/main/java/com/brentvatne/exoplayer/ResizeMode.java | 2 +- .../java/com/brentvatne/exoplayer/VideoEventEmitter.java | 2 +- package.json | 5 ----- react-native.config.js | 7 +++++++ 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 react-native.config.js diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java index fc966005b5..9f3d09bed0 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java +++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java @@ -2,7 +2,7 @@ import android.annotation.TargetApi; import android.content.Context; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.util.Log; import android.view.Gravity; diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java index 002c32ad4f..ceea420c14 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java +++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java @@ -1,6 +1,6 @@ package com.brentvatne.exoplayer; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java index 00f51c94cd..24d51e026f 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java +++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java @@ -1,6 +1,6 @@ package com.brentvatne.exoplayer; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import android.view.View; import com.facebook.react.bridge.Arguments; diff --git a/package.json b/package.json index d86ed89faf..f50dc73bd8 100644 --- a/package.json +++ b/package.json @@ -45,11 +45,6 @@ "scripts": { "test": "node_modules/.bin/eslint *.js" }, - "rnpm": { - "android": { - "sourceDir": "./android-exoplayer" - } - }, "files": [ "android-exoplayer", "android", diff --git a/react-native.config.js b/react-native.config.js new file mode 100644 index 0000000000..307edc24f3 --- /dev/null +++ b/react-native.config.js @@ -0,0 +1,7 @@ +module.exports = { + project: { + android: { + sourceDir: './android-exoplayer', + }, + }, +};