Merge pull request #206 from square/charmis/upgrade_version_IAP_1.6.1

upgrade version to 1.6.1

Author: CharmisG

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### v1.7.3 April 05, 2023
+
+* Upgrade IAP SDK for Android `1.6.2` and for iOS `1.6.1`.
+* An important update to SquareBuyerVerificationSDK that mitigates the risk of declining 3-D Secure (3DS) payments for ios.
+* Various bug fixes.
+
 ### v1.7.2 May 23, 2022
 
 * Upgrade IAP SDK to `1.5.6`.

README.md

@@ -6,8 +6,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.5.6`
-  * Android: `1.5.6`
+  * iOS: `1.6.1`
+  * Android: `1.6.2`
 
 ## Additional documentation
 

RNSquareInAppPayments.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSquareInAppPayments"
-  s.version      = "1.5.6"
+  s.version      = "1.6.1"
   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.5.6'
-    s.dependency 'SquareBuyerVerificationSDK', '1.5.6'
+    s.dependency 'SquareInAppPaymentsSDK', '1.6.1'
+    s.dependency 'SquareBuyerVerificationSDK', '1.6.1'
   end
 
 end

android/build.gradle

@@ -1,25 +1,25 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
     }
 }
 
 apply plugin: 'com.android.library'
 
-def MIN_IAP_SDK_VERSION = '1.5.6'
+def MIN_IAP_SDK_VERSION = '1.6.2'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -35,7 +35,7 @@ android {
 rootProject.allprojects {
     repositories {
         google()
-        maven {
+       maven {
             url 'https://sdk.squareup.com/public/android'
         }
     }

docs/get-started.md

@@ -113,7 +113,16 @@ to download In-App Payments SDK automatically by following the steps below.
     ```bash
     pod install
     ```
-
+1. Add an In-App Payments SDK build phase:
+    1. Open the **Xcode** project for your application.
+    1. In the **Build Phases** tab for your application target, click the **+**
+        button at the top of the pane.
+    1. Select **New Run Script Phase**.
+    1. Paste the following into the editor panel of the new run script:
+        ```
+        FRAMEWORKS="${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+        "${FRAMEWORKS}/SquareInAppPaymentsSDK.framework/setup"
+        ```
 ## Step 4: Configure your Android project
 
 1. Open `android/build.gradle` and set your `minSdkVersion` to `21` or greater.

docs/versioning.md

@@ -17,12 +17,23 @@ You can override the default In-App Payments SDK versions by following this guid
     $sqipVersion = '1.7.1'
     ```
 
-1. Remove the `ios/Podfile.lock` and build your project again.
+2. Remove the `ios/Podfile.lock` and build your project again.
     ```bash
     cd ios
     rm Podfile.lock
     pod install
     ```
+3. Add build phase to setup the SquareInAppPaymentsSDK and/or SquareBuyerVerificationSDK framework
+    After adding the framework using any of the above methods, follow the below instructions to complete the setup.
+
+    On your application targets’ Build Phases settings tab, click the + icon and choose New Run Script Phase. Create a Run Script in which you specify your shell (ex: /bin/sh), add the following contents to the script area below the shell:
+    ```bash
+    FRAMEWORKS="${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+    "${FRAMEWORKS}/SquareInAppPaymentsSDK.framework/setup"
+    ```
+
+Note : If you are using SquareBuyerVerificationSDK earlier than version 1.6.1 for iOS, please upgrade to 1.6.1 so that the SDK can process 3DS-enabled payments. The SDK will decline 3DS-enabled payments made after March 31, 2023 if the SDK version is earlier than 1.6.1.
+
 
 ## Android
 

react-native-in-app-payments-quickstart/android/app/build.gradle

@@ -167,6 +167,9 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+    buildFeatures {
+        viewBinding true
+    }
 
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
@@ -190,7 +193,9 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.core:core-ktx:1.9.0"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'

react-native-in-app-payments-quickstart/android/build.gradle

@@ -2,17 +2,16 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "30.0.3"
+        buildToolsVersion = "33.0.2"
         minSdkVersion = 24
-        compileSdkVersion = 32
-        targetSdkVersion = 32
+        compileSdkVersion = 33
+        targetSdkVersion = 33
         ndkVersion = "20.1.5948944"
-        sqipVersion="1.5.6"
+        sqipVersion="1.6.2"
         kotlin_version = '1.7.10'
     }
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
     dependencies {
@@ -44,9 +43,18 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
+        mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
+            content {
+                excludeGroup "com.facebook.react"
+            }
+        }
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://www.jitpack.io' }
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }

react-native-in-app-payments-quickstart/android/gradle.properties

@@ -20,5 +20,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.75.1
+FLIPPER_VERSION=0.99.0
 org.gradle.jvmargs=-Xmx1536M --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED

react-native-in-app-payments-quickstart/ios/Podfile.lock

@@ -285,12 +285,12 @@ PODS:
     - React-perflogger (= 0.68.0)
   - RNGestureHandler (2.9.0):
     - React-Core
-  - RNSquareInAppPayments (1.5.6):
+  - RNSquareInAppPayments (1.6.1):
     - React
-    - SquareBuyerVerificationSDK (= 1.5.6)
-    - SquareInAppPaymentsSDK (= 1.5.6)
-  - SquareBuyerVerificationSDK (1.5.6)
-  - SquareInAppPaymentsSDK (1.5.6)
+    - SquareBuyerVerificationSDK (= 1.6.1)
+    - SquareInAppPaymentsSDK (= 1.6.1)
+  - SquareBuyerVerificationSDK (1.6.1)
+  - SquareInAppPaymentsSDK (1.6.1)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -437,11 +437,11 @@ SPEC CHECKSUMS:
   React-runtimeexecutor: 9b1304f48e344c55bb3c36e13bf11461cb4da5d8
   ReactCommon: fab89a13b52f1ac42b59a0e4b4f76f21aea9eebe
   RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
-  RNSquareInAppPayments: 3b4f6e96d1575c856255de00b27f36e702db45d4
-  SquareBuyerVerificationSDK: d1253b4ed9a1226dc8d4b5bc800cd47886768078
-  SquareInAppPaymentsSDK: 99476a38e643d4f2ebf86c0c2167752553683481
+  RNSquareInAppPayments: ede813773dc54376c765fdf6ca77a68ae763ac99
+  SquareBuyerVerificationSDK: f200ad95adc08bdefc80619cfa462f0451a7c436
+  SquareInAppPaymentsSDK: 44371b3788070e74b43009ab90649455277653b4
   Yoga: 6671cf077f614314c22fd09ddf87d7abeee64e96
 
-PODFILE CHECKSUM: 1d41a1d217b2c7cc0e90c8b7bf895c82a760b977
+PODFILE CHECKSUM: 02a139017a637df9e67a6a8dae0046dd7bb21bfa
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0