Skip to content

Commit

Permalink
Merge pull request #17 from razorpay/rn_update
Browse files Browse the repository at this point in the history
React Native version update
  • Loading branch information
pronav committed Mar 8, 2017
2 parents 8c8d7d0 + 42119ae commit b185ba0
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
4 changes: 3 additions & 1 deletion android/src/main/java/com/razorpay/rn/RazorpayModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
onActivityResult(requestCode, resultCode, data);
}

@Override
public void onNewIntent(Intent intent) {}


public void onActivityResult(int requestCode, int resultCode, Intent data){
Checkout.handleActivityResult(getCurrentActivity(), requestCode, resultCode, data, this, this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class MainApplication extends Application implements ReactApplication {

private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
@Override
protected boolean getUseDeveloperSupport() {
public boolean getUseDeveloperSupport() {
return BuildConfig.DEBUG;
}

Expand Down
4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "example",
"version": "0.0.1",
"version": "0.0.2",
"private": true,
"scripts": {
"start": "node_modules/react-native/packager/packager.sh"
},
"dependencies": {
"react": ">=15.0.0",
"react-native": ">=0.30.0",
"react-native": ">=0.40.0",
"react-native-razorpay": "./../"
}
}
2 changes: 1 addition & 1 deletion ios/RazorpayCheckout.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2016 Razorpay. All rights reserved.
//

#import "RCTBridgeModule.h"
#import <React/RCTBridgeModule.h>

@interface RazorpayCheckout : NSObject <RCTBridgeModule>

Expand Down
2 changes: 1 addition & 1 deletion ios/RazorpayEventEmitter.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2016 Facebook. All rights reserved.
//

#import "RCTEventEmitter.h"
#import <React/RCTEventEmitter.h>

@interface RazorpayEventEmitter : RCTEventEmitter

Expand Down
4 changes: 2 additions & 2 deletions ios/RazorpayEventEmitter.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#import "RazorpayEventEmitter.h"

#import "RCTBridge.h"
#import "RCTEventDispatcher.h"
#import <React/RCTBridge.h>
#import <React/RCTEventDispatcher.h>

NSString *const kPaymentError = @"PAYMENT_ERROR";
NSString *const kPaymentSuccess = @"PAYMENT_SUCCESS";
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-razorpay",
"version": "1.1.1",
"version": "1.2.0",
"description": "React Native wrapper for Razorpay",
"main": "RazorpayCheckout.js",
"scripts": {
Expand All @@ -12,10 +12,10 @@
"url": "git+https://github.com/razorpay/react-native-razorpay.git"
},
"dependencies": {
"react-native": "<0.40.0"
"react-native": ">=0.40.0"
},
"peerDependencies": {
"react-native": "<0.40.0"
"react-native": ">=0.40.0"
},
"keywords": [
"react-native",
Expand Down

0 comments on commit b185ba0

Please sign in to comment.