Fix Expo SDK 50 Build Issues. (#15)

Fix issues that cause build errors when building an Expo app.
appfolio · Apr 30, 2024 · 21f4a31 · 21f4a31
1 parent f858246
commit 21f4a31
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,20 +1,24 @@
 apply plugin: 'com.android.library'
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion safeExtGet("compileSdkVersion", 28)
+    buildToolsVersion safeExtGet("buildToolsVersion", "28.0.3")
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion safeExtGet("minSdkVersion", 21)
+        targetSdkVersion safeExtGet("targetSdkVersion", 28)
         versionCode 1
         versionName "1.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
     }
     lintOptions {
-       warning 'InvalidPackage'
+        warning 'InvalidPackage'
     }
 }
 

diff --git a/ios/ReactNativePayments.h b/ios/ReactNativePayments.h
@@ -2,11 +2,7 @@
 @import PassKit;
 @import AddressBook;
 
-#if __has_include("RCTBridgeModule.h")
-#import "RCTBridgeModule.h"
-#else
 #import <React/RCTBridgeModule.h>
-#endif
 
 #import "GatewayManager.h"
 

diff --git a/react-native-payments.podspec b/react-native-payments.podspec
@@ -15,5 +15,9 @@ Pod::Spec.new do |s|
   s.requires_arc     = true
 
   s.dependency 'React'
-  s.dependency 'Stripe', '~> 19'
+
+  # Stripe support on this fork is completely untested. This change to depend on
+  # stripe 23 is to fix simulator build issues in our app. We do not use stripe,
+  # and I make no guarantee that this works.
+  s.dependency 'Stripe', '~> 23'
 end