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:+' } 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(); - } } diff --git a/package.json b/package.json index 9e3bb247..46919bcd 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,8 @@ "main": "webview-bridge", "dependencies": { "invariant": "2.2.0", - "keymirror": "0.1.1" + "keymirror": "0.1.1", + "prop-types": "^15.5.10", + "create-react-class": "^15.6.0" } } diff --git a/webview-bridge/index.android.js b/webview-bridge/index.android.js index bdfe8180..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 } = React; 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, @@ -230,4 +231,4 @@ var styles = StyleSheet.create({ }, }); -module.exports = WebViewBridge; \ No newline at end of file +module.exports = WebViewBridge; diff --git a/webview-bridge/index.ios.js b/webview-bridge/index.ios.js index b47dc338..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 } = React; 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,