Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade react-native-video and drop jetifier on Android #38426

Merged
merged 15 commits into from
Feb 10, 2022
Merged

Upgrade react-native-video and drop jetifier on Android #38426

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c99295a
Disable jetifier
mchowning Feb 1, 2022
9097bd6
Update react-native-video
mchowning Feb 1, 2022
3259215
Fresh package-lock file
mchowning Feb 2, 2022
a83b306
Update package-lock.json file
mchowning Feb 2, 2022
ec88306
react-native-video version without apache deps
mchowning Feb 4, 2022
5e012ef
Removed react-native-video
mchowning Feb 4, 2022
557000e
Add react-native-video back
mchowning Feb 4, 2022
fa4a4be
Reset package-lock.json
mchowning Feb 4, 2022
6178b65
Partial package-lock.json update
mchowning Feb 4, 2022
8ef0eef
Reset package-lock.json
mchowning Feb 4, 2022
c023612
Add react-native-video back in
mchowning Feb 4, 2022
77a0aea
Update react-native-video dependency
mchowning Feb 9, 2022
8035ea3
Update package-lock.json
mchowning Feb 9, 2022
11f9004
Update react-native-video to reference tag version
mchowning Feb 10, 2022
a3cdccf
Make usage of tabs consistent
mchowning Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/react-native-aztec/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
shouldPublishBinary=false

2 changes: 1 addition & 1 deletion packages/react-native-bridge/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false

12 changes: 0 additions & 12 deletions packages/react-native-bridge/android/react-native-bridge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,6 @@ repositories {
maven { url "https://jitpack.io" }
google()
mavenCentral()
maven {
url "https://a8c-libs.s3.amazonaws.com/android/jcenter-mirror"
content {
includeVersion "com.google.android.exoplayer", "exoplayer-core", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-dash", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-hls", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-smoothstreaming", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-ui", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer", "2.9.3"
includeVersion "com.google.android.exoplayer", "extension-okhttp", "2.9.3"
}
}
}

dependencies {
Expand Down
12 changes: 0 additions & 12 deletions packages/react-native-editor/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,18 +172,6 @@ repositories {
google()
mavenCentral()
maven { url "https://jitpack.io" }
maven {
url "https://a8c-libs.s3.amazonaws.com/android/jcenter-mirror"
content {
includeVersion "com.google.android.exoplayer", "exoplayer-core", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-dash", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-hls", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-smoothstreaming", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer-ui", "2.9.3"
includeVersion "com.google.android.exoplayer", "exoplayer", "2.9.3"
includeVersion "com.google.android.exoplayer", "extension-okhttp", "2.9.3"
}
}
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-editor/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.enableJetifier=false
android.useDeprecatedNdk=true
FLIPPER_VERSION=0.99.0
2 changes: 1 addition & 1 deletion packages/react-native-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"react-native-screens": "https://raw.githubusercontent.com/wordpress-mobile/react-native-screens/2.9.0-wp-2/react-native-screens-2.9.0-wp-2.tgz",
"react-native-svg": "https://raw.githubusercontent.com/wordpress-mobile/react-native-svg/v9.13.7-wp-2/react-native-svg-9.13.7-wp-2.tgz",
"react-native-url-polyfill": "^1.1.2",
"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.0.2-wp-2/react-native-video-5.0.2-wp-2.tgz",
"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/wp-fork-upstream-5.2.0/react-native-video-5.2.0-wp-1.tgz",
"react-native-webview": "https://raw.githubusercontent.com/wordpress-mobile/react-native-webview/v11.6.5-wp-2/react-native-webview-11.6.5-wp-2.tgz"
},
"publishConfig": {
Expand Down