Merge branch 'master' into upgrade-react-native

razorpay · Aug 2, 2019 · 5a37969 · 5a37969
2 parents 17a4d99 + f4d1777
commit 5a37969
Show file tree

Hide file tree

Showing 23 changed files with 96 additions and 40 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,20 +2,24 @@ apply plugin: 'com.android.library'
 repositories {
     mavenCentral()
 }
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdkVersion safeExtGet('compileSdkVersion', 28)
+
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 26
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 28)
         versionCode 1
         versionName "1.0"
     }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.razorpay:checkout:1.5.5'
+    implementation 'com.razorpay:checkout:1.5.12'
 }
-  
+
diff --git a/ios/Razorpay.framework/Checkout.storyboardc/Info.plist b/ios/Razorpay.framework/Checkout.storyboardc/Info.plist
diff --git a/ios/Razorpay.framework/Checkout.storyboardc/RBq-mH-fUs-view-vI7-59-shd.nib/objects-11.0+.nib b/ios/Razorpay.framework/Checkout.storyboardc/RBq-mH-fUs-view-vI7-59-shd.nib/objects-11.0+.nib
diff --git a/ios/Razorpay.framework/Checkout.storyboardc/RBq-mH-fUs-view-vI7-59-shd.nib/runtime.nib b/ios/Razorpay.framework/Checkout.storyboardc/RBq-mH-fUs-view-vI7-59-shd.nib/runtime.nib
diff --git a/ios/Razorpay.framework/Checkout.storyboardc/RazorpayCheckoutVC.nib/objects-11.0+.nib b/ios/Razorpay.framework/Checkout.storyboardc/RazorpayCheckoutVC.nib/objects-11.0+.nib
diff --git a/ios/Razorpay.framework/Checkout.storyboardc/RazorpayCheckoutVC.nib/runtime.nib b/ios/Razorpay.framework/Checkout.storyboardc/RazorpayCheckoutVC.nib/runtime.nib
diff --git a/...ay.framework/Checkout.storyboardc/UINavigationController-ODs-ga-9IN.nib/objects-11.0+.nib b/...ay.framework/Checkout.storyboardc/UINavigationController-ODs-ga-9IN.nib/objects-11.0+.nib
diff --git a/...Razorpay.framework/Checkout.storyboardc/UINavigationController-ODs-ga-9IN.nib/runtime.nib b/...Razorpay.framework/Checkout.storyboardc/UINavigationController-ODs-ga-9IN.nib/runtime.nib
diff --git a/ios/Razorpay.framework/EncryptedOtpelf.js b/ios/Razorpay.framework/EncryptedOtpelf.js
diff --git a/ios/Razorpay.framework/Hash.txt b/ios/Razorpay.framework/Hash.txt
@@ -1 +1 @@
-f5a09eaca599ce1fd77fd29060724953
+a2b4918de55f2baa79e6096e2529f5fe
diff --git a/ios/Razorpay.framework/Headers/Razorpay-Swift.h b/ios/Razorpay.framework/Headers/Razorpay-Swift.h
diff --git a/ios/Razorpay.framework/Info.plist b/ios/Razorpay.framework/Info.plist
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftdoc b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftdoc
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftdoc b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftdoc
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/armv7.swiftdoc b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/armv7.swiftdoc
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/armv7.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/armv7.swiftmodule
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftdoc b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftdoc
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftdoc b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftdoc
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule
diff --git a/ios/Razorpay.framework/Razorpay b/ios/Razorpay.framework/Razorpay