Merge branch 'wp-fork' into update/android-12

# Conflicts: # package.json
wordpress-mobile · Oct 13, 2022 · 797e50f · 797e50f
2 parents 26ff651 + 55cc934
commit 797e50f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Video.js b/Video.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { StyleSheet, requireNativeComponent, NativeModules, View, ViewPropTypes, Image, Platform, findNodeHandle } from 'react-native';
+import { StyleSheet, requireNativeComponent, NativeModules, View, Image, Platform, findNodeHandle } from 'react-native';
+import { ViewPropTypes, ImagePropTypes } from 'deprecated-react-native-prop-types';
 import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
 import TextTrackType from './TextTrackType';
 import FilterType from './FilterType';
@@ -415,7 +416,7 @@ Video.propTypes = {
   maxBitRate: PropTypes.number,
   resizeMode: PropTypes.string,
   poster: PropTypes.string,
-  posterResizeMode: Image.propTypes.resizeMode,
+  posterResizeMode: ImagePropTypes.resizeMode,
   repeat: PropTypes.bool,
   automaticallyWaitsToMinimizeStalling: PropTypes.bool,
   allowsExternalPlayback: PropTypes.bool,

diff --git a/android-exoplayer/build.gradle b/android-exoplayer/build.gradle
@@ -37,7 +37,7 @@ repositories {
 dependencies {
     if (project == rootProject) {
         // If this is the root project (e.g. Jitpack), specify a version
-        implementation 'com.facebook.react:react-native:0.66.2'
+        implementation 'com.facebook.react:react-native:0.69.4'
     } else {
         //noinspection GradleDynamicVersion
         api "com.facebook.react:react-native:+"

diff --git a/android/build.gradle b/android/build.gradle
@@ -31,7 +31,7 @@ repositories {
 dependencies {
     if (project == rootProject) {
         // If this is the root project (e.g. Jitpack), specify a version
-        implementation 'com.facebook.react:react-native:0.66.2'
+        implementation 'com.facebook.react:react-native:0.69.4'
     } else {
         //noinspection GradleDynamicVersion
         api "com.facebook.react:react-native:+"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-video",
-    "version": "5.2.0-wp-4",
+    "version": "5.2.0-wp-3",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",
@@ -38,7 +38,8 @@
         "react-native-windows": "^0.64.0"
     },
     "dependencies": {
-        "prop-types": "^15.7.2"
+        "prop-types": "^15.7.2",
+        "deprecated-react-native-prop-types": "^2.2.0"
     },
     "scripts": {
         "lint": "yarn eslint *.js"

diff --git a/react-native-video-5.2.0-wp-3.tgz b/react-native-video-5.2.0-wp-3.tgz