Merge pull request #237 from square/mansi/upgrade_android_ios_version

Upgrade Android and IOS version

.babelrc

@@ -1,4 +1,15 @@
 {
-  "presets": ["module:metro-react-native-babel-preset"],
-  "plugins": ["jest-hoist"],
-}
+  "presets": [
+    [
+      "env",
+      {
+        "exclude": [
+          "transform-es2015-classes"
+        ]
+      }
+    ]
+  ],
+  "plugins": [
+    "jest-hoist"
+  ]
+}

.github/workflows/main.yml

@@ -7,15 +7,22 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 18.x
       - run: |
           yarn && yarn lint && yarn test
-          cd react-native-in-app-payments-quickstart && yarn && yarn lint && cd .. 
+          cd react-native-in-app-payments-quickstart && yarn && cd .. 
 
   build-android:
     needs: install-and-test
     runs-on: ubuntu-latest
-    steps:      
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with: 
+          distribution: 'temurin'
+          java-version: '17'
       - name: Cache Gradle Wrapper
         uses: actions/cache@v2
         with:
@@ -37,12 +44,12 @@ jobs:
   build-ios:
     needs: install-and-test
     runs-on: macos-latest
-    steps: 
+    steps:
       - uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
       - run: |
           gem install cocoapods
           cd react-native-in-app-payments-quickstart
@@ -57,4 +64,6 @@ jobs:
         -configuration Debug \
         -UseModernBuildSystem=NO \
         -archivePath $PWD/RNInAppPaymentsQuickstart \
-        CODE_SIGNING_ALLOWED=NO"  
+        CODE_SIGNING_ALLOWED=NO \
+        CODE_SIGNING_REQUIRED=NO \
+        CODE_SIGN_IDENTITY=NO"

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### v1.7.6 Apr 23, 2024
+
+* Upgrade IAP SDK for Android `1.6.6` and for iOS `1.6.3`.
+
 ### v1.7.5 Oct 12, 2023
 
 * Upgrade IAP SDK for Android `1.6.5`.

README.md

@@ -5,8 +5,8 @@
 The In-App Payments plugin for Square [In-App Payments SDK] is a wrapper for the native Android and iOS SDKs and 
 supports the following native In-App Payments SDK versions:
 
-  * iOS: `1.6.2`
-  * Android: `1.6.5`
+  * iOS: `1.6.3`
+  * Android: `1.6.6`
 
 ## Additional documentation
 

RNSquareInAppPayments.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSquareInAppPayments"
-  s.version      = "1.6.2"
+  s.version      = "1.6.3"
   s.summary      = "React Native plugin for Square's In-App Payments SDK"
   s.description  = <<-DESC
                    An open source React Native plugin for calling Square’s native In-App Payments SDK to take in-app payments on iOS and Android.
@@ -22,8 +22,8 @@ Pod::Spec.new do |s|
     s.dependency 'SquareInAppPaymentsSDK', $sqipVersion
     s.dependency 'SquareBuyerVerificationSDK', $sqipVersion
   else
-    s.dependency 'SquareInAppPaymentsSDK', '1.6.2'
-    s.dependency 'SquareBuyerVerificationSDK', '1.6.2'
+    s.dependency 'SquareInAppPaymentsSDK', '1.6.3'
+    s.dependency 'SquareBuyerVerificationSDK', '1.6.3'
   end
 
 end

android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
 
 apply plugin: 'com.android.library'
 
-def MIN_IAP_SDK_VERSION = '1.6.5'
+def MIN_IAP_SDK_VERSION = '1.6.6'
 
 android {
     compileSdkVersion 33

android/src/main/java/sqip/react/CardEntryModule.java

@@ -301,7 +301,7 @@ private BuyerAction getBuyerAction(final String buyerActionString, final Money m
   private long readCardEntryCloseExitAnimationDurationMs() {
     long delayDurationMs = 0;
     Resources.Theme theme = Objects.requireNonNull(getCurrentActivity()).getResources().newTheme();
-    theme.applyStyle(R.style.sqip_Theme_CardEntry, true);
+    theme.applyStyle(R.style.sqip_ThemeCardEntry, true);
     int[] attrs = { android.R.attr.activityCloseExitAnimation };
     TypedArray typedArray = theme.obtainStyledAttributes(null, attrs, android.R.attr.windowAnimationStyle, 0);
     int resId = typedArray.getResourceId(0, -1);

android/src/main/res/values/styles.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="sqip_ThemeCardEntry" parent="@style/Theme.AppCompat.DayNight.DarkActionBar" />
+</resources>

docs/get-started.md

@@ -139,7 +139,7 @@ are just examples.
           compileSdkVersion = 33
           targetSdkVersion = 33
           supportLibVersion = "33.0.0"
-          sqipVersion="1.6.5"
+          sqipVersion="1.6.6"
       }
       ...
     }

ios/RNSquareInAppPayments.xcodeproj/project.pbxproj

@@ -393,7 +393,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -430,7 +430,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

jest.config.js

@@ -14,4 +14,5 @@ module.exports = {
     '\\.snap$',
     '<rootDir>/node_modules/',
   ],
+  testEnvironment: 'node',
 };

package.json

@@ -39,8 +39,8 @@
     "eslint-plugin-react-native": "^3.11.0",
     "jest": "^27.0.6",
     "metro-react-native-babel-preset": "0.56.0",
-    "react": "^17.0.2",
-    "react-native": "0.64.1",
+    "react": "18.2.0",
+    "react-native": "0.74.1",
     "react-test-renderer": "16.9.0",
     "ts-jest": "^27.0.3",
     "typescript": "^4.3.5"
@@ -62,4 +62,4 @@
     "**/**/logkitty": "^0.7.1",
     "**/**/minimist": "^0.2.1"
   }
-}
+}

react-native-in-app-payments-quickstart/.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
   settings: {
     'import/resolver': {
       node: {
-        extensions: ['.js', '.jsx', '.ts', '.tsx'],
+        extensions: ['.js', '.jsx', '.ts', '.tsx']
       },
     },
   },
@@ -32,5 +32,6 @@ module.exports = {
     'class-methods-use-this': 0,
     'import/no-extraneous-dependencies': 0,
     'import/extensions': 0,
+    'import/no-unresolved': 2,
   },
 };

react-native-in-app-payments-quickstart/.gitignore

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -29,33 +30,45 @@ build/
 local.properties
 *.iml
 *.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-!debug.keystore
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
 
 # Ruby / CocoaPods
-/ios/Pods/
+**/Pods/
 /vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions