From 1a7222e72c96d8fdaec966a645d56f499e1465f0 Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Thu, 31 Aug 2017 03:15:25 +0300 Subject: [PATCH 1/8] removed deprecated --- .../alinz/reactnativewebviewbridge/WebViewBridgePackage.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgePackage.java b/android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgePackage.java index 1e189c4d..07e62ac4 100644 --- a/android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgePackage.java +++ b/android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgePackage.java @@ -22,9 +22,4 @@ public List createViewManagers(ReactApplicationContext reactApplica new WebViewBridgeManager() ); } - - @Override - public List> createJSModules() { - return Arrays.asList(); - } } From f7991626d1febaf34db2d023b69f2855ffd26e91 Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Thu, 31 Aug 2017 16:12:10 +0300 Subject: [PATCH 2/8] require prop-types --- webview-bridge/index.android.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webview-bridge/index.android.js b/webview-bridge/index.android.js index bdfe8180..26e4a513 100644 --- a/webview-bridge/index.android.js +++ b/webview-bridge/index.android.js @@ -33,7 +33,7 @@ var { WebViewBridgeManager } } = ReactNative; -var { PropTypes } = React; +var PropTypes = require('prop-types'); var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge'; @@ -230,4 +230,4 @@ var styles = StyleSheet.create({ }, }); -module.exports = WebViewBridge; \ No newline at end of file +module.exports = WebViewBridge; From 3de0ee0be9fbcaf0eb666be455c4fc5eef4dac7c Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Thu, 31 Aug 2017 16:12:51 +0300 Subject: [PATCH 3/8] require prop-types ios --- webview-bridge/index.ios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webview-bridge/index.ios.js b/webview-bridge/index.ios.js index b47dc338..c5beef22 100644 --- a/webview-bridge/index.ios.js +++ b/webview-bridge/index.ios.js @@ -33,7 +33,7 @@ var { WebViewBridgeManager } } = ReactNative; -var { PropTypes } = React; +var PropTypes = require('prop-types'); var BGWASH = 'rgba(255,255,255,0.8)'; var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge'; From 0b7cbe75230a31c1078c9058436ca82887ebe4c5 Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Thu, 31 Aug 2017 16:13:58 +0300 Subject: [PATCH 4/8] prop-types dependency --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e3bb247..749154a8 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "main": "webview-bridge", "dependencies": { "invariant": "2.2.0", - "keymirror": "0.1.1" + "keymirror": "0.1.1", + "prop-types": "^15.5.10" } } From 34a82bee07eedc5d05efb260ddeb6dbe093666a5 Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Thu, 31 Aug 2017 16:20:57 +0300 Subject: [PATCH 5/8] create-react-class --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 749154a8..46919bcd 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "dependencies": { "invariant": "2.2.0", "keymirror": "0.1.1", - "prop-types": "^15.5.10" + "prop-types": "^15.5.10", + "create-react-class": "^15.6.0" } } From 8765603846892b5c7c394ebd93dc922265530915 Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Thu, 31 Aug 2017 16:24:34 +0300 Subject: [PATCH 6/8] createReactClass android --- webview-bridge/index.android.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webview-bridge/index.android.js b/webview-bridge/index.android.js index 26e4a513..80e265ba 100644 --- a/webview-bridge/index.android.js +++ b/webview-bridge/index.android.js @@ -18,6 +18,8 @@ var ReactNative = require('react-native'); var invariant = require('invariant'); var keyMirror = require('keymirror'); var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource'); +var createReactClass = require('create-react-class'); +var PropTypes = require('prop-types'); var { ReactNativeViewAttributes, @@ -33,7 +35,6 @@ var { WebViewBridgeManager } } = ReactNative; -var PropTypes = require('prop-types'); var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge'; @@ -48,7 +49,7 @@ var RCTWebViewBridge = requireNativeComponent('RCTWebViewBridge', WebViewBridge) /** * Renders a native WebView. */ -var WebViewBridge = React.createClass({ +var WebViewBridge = createReactClass({ propTypes: { ...RCTWebViewBridge.propTypes, From 68e492e3fd53b78eeefaacf384431ff2aec4e467 Mon Sep 17 00:00:00 2001 From: iyegoroff Date: Thu, 31 Aug 2017 16:26:05 +0300 Subject: [PATCH 7/8] create-react-class ios --- webview-bridge/index.ios.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webview-bridge/index.ios.js b/webview-bridge/index.ios.js index c5beef22..f757b34a 100644 --- a/webview-bridge/index.ios.js +++ b/webview-bridge/index.ios.js @@ -19,6 +19,8 @@ var ReactNative = require('react-native'); var invariant = require('invariant'); var keyMirror = require('keymirror'); var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource'); +var createReactClass = require('create-react-class'); +var PropTypes = require('prop-types'); var { ActivityIndicator, @@ -33,7 +35,6 @@ var { WebViewBridgeManager } } = ReactNative; -var PropTypes = require('prop-types'); var BGWASH = 'rgba(255,255,255,0.8)'; var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge'; @@ -90,7 +91,7 @@ var defaultRenderError = (errorDomain, errorCode, errorDesc) => ( /** * Renders a native WebView. */ -var WebViewBridge = React.createClass({ +var WebViewBridge = createReactClass({ statics: { JSNavigationScheme: JSNavigationScheme, NavigationType: NavigationType, From cba0ebeb37b38acd847f12a32e0ae2ef50521754 Mon Sep 17 00:00:00 2001 From: Matt Labrum Date: Mon, 16 Oct 2017 14:16:41 +1030 Subject: [PATCH 8/8] Fix build.gradle react native to point to latest installed --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index dfec22af..a7208152 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,5 +30,5 @@ repositories { } dependencies { - compile 'com.facebook.react:react-native:0.19.+' + compile 'com.facebook.react:react-native:+' }