From 8b3391c32cef18e252aa326e9e3c60a2ad50f3e9 Mon Sep 17 00:00:00 2001 From: Nilay-squareup Date: Mon, 2 Sep 2024 19:17:38 +0530 Subject: [PATCH 1/7] Reader SDK version bump to 1.7.4 --- CHANGELOG.md | 2 +- README.md | 2 +- RNReaderSDK.podspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5196cdd8..c0de931e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### v1.4.5 Apr 25, 2024 -* Upgrade Reader SDK version support to 1.7.2 for iOS +* Upgrade Reader SDK version support to 1.7.4 for iOS ### v1.4.4 Aug 16, 2023 diff --git a/README.md b/README.md index d18fded5..64fdc33a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This repo contains a React Native plugin for Square [Reader SDK]. Reader SDK for React Native supports the following native Reader SDK versions: - * iOS: 1.7.2 and above + * iOS: 1.7.4 and above * Android: 1.7.5 and above >This plugin loads latest version of native Reader SDK by default according to [update policy for Reader SDK]. diff --git a/RNReaderSDK.podspec b/RNReaderSDK.podspec index 98b43570..0d5ad2af 100644 --- a/RNReaderSDK.podspec +++ b/RNReaderSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "RNReaderSDK" - s.version = "1.7.2" + s.version = "1.7.4" s.summary = "A React Native plugin for Square Reader SDK" s.description = <<-DESC A React Native plugin for Square Reader SDK From b9fa58545a7eab81190bb05c8d633db06728ecbc Mon Sep 17 00:00:00 2001 From: Nilay-squareup Date: Mon, 9 Sep 2024 18:48:33 +0530 Subject: [PATCH 2/7] version bump android 1..7.7 and ios 1.7.6 --- CHANGELOG.md | 6 +++--- README.md | 4 ++-- RNReaderSDK.podspec | 2 +- android/build.gradle | 2 +- reader-sdk-react-native-quickstart/android/app/build.gradle | 5 ++++- .../src/main/java/com/rnreadersdksample/MainApplication.kt | 3 ++- reader-sdk-react-native-quickstart/android/build.gradle | 4 ++-- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0de931e..efb6bc8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,12 @@ ### v1.4.5 Apr 25, 2024 -* Upgrade Reader SDK version support to 1.7.4 for iOS +* Upgrade Reader SDK version support to 1.7.6 for iOS ### v1.4.4 Aug 16, 2023 -* Upgrade Reader SDK version support to 1.7.5 for Android -* Support CompileSDK and targetSDK 33 on Android +* Upgrade Reader SDK version support to 1.7.7 for Android +* Support CompileSDK and targetSDK 34 on Android ### v1.4.3 Jan 20, 2023 diff --git a/README.md b/README.md index 64fdc33a..11e7ec24 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ This repo contains a React Native plugin for Square [Reader SDK]. Reader SDK for React Native supports the following native Reader SDK versions: - * iOS: 1.7.4 and above - * Android: 1.7.5 and above + * iOS: 1.7.6 and above + * Android: 1.7.7 and above >This plugin loads latest version of native Reader SDK by default according to [update policy for Reader SDK]. diff --git a/RNReaderSDK.podspec b/RNReaderSDK.podspec index 0d5ad2af..bc048c42 100644 --- a/RNReaderSDK.podspec +++ b/RNReaderSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "RNReaderSDK" - s.version = "1.7.4" + s.version = "1.7.6" s.summary = "A React Native plugin for Square Reader SDK" s.description = <<-DESC A React Native plugin for Square Reader SDK diff --git a/android/build.gradle b/android/build.gradle index ae892051..9f04f4dc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -28,7 +28,7 @@ buildscript { apply plugin: 'com.android.library' def DEFAULT_PLAY_SERVICES_BASE_VERSION = '16.0.1' -def READER_SDK_VERSION = '1.7.4' +def READER_SDK_VERSION = '1.7.7' android { compileSdkVersion 33 diff --git a/reader-sdk-react-native-quickstart/android/app/build.gradle b/reader-sdk-react-native-quickstart/android/app/build.gradle index 07e86b41..8d37ef1b 100644 --- a/reader-sdk-react-native-quickstart/android/app/build.gradle +++ b/reader-sdk-react-native-quickstart/android/app/build.gradle @@ -220,7 +220,10 @@ dependencies { } // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - // implementation 'com.reactnative:react-native-square-reader-sdk:1.7.2' + // implementation 'com.reactnative:react-native-square-reader-sdk:1.7.4' + def readerSdkVersion = "1.7.7" + implementation "com.squareup.sdk.reader:reader-sdk-$SQUARE_READER_SDK_APPLICATION_ID:$readerSdkVersion" + runtimeOnly "com.squareup.sdk.reader:reader-sdk-internals:$readerSdkVersion" implementation "androidx.multidex:multidex:2.0.1" diff --git a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt index 7dfdd8f1..b5413198 100644 --- a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt +++ b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt @@ -18,10 +18,11 @@ import com.facebook.react.ReactNativeHost import com.facebook.react.ReactPackage import com.facebook.react.PackageList import com.facebook.soloader.SoLoader -import com.squareup.sdk.reader.ReaderSdk import com.rnreadersdksample.MainApplication + import android.content.Context import com.facebook.react.ReactInstanceManager +import com.squareup.sdk.reader.ReaderSdk import java.lang.ClassNotFoundException import java.lang.NoSuchMethodException import java.lang.IllegalAccessException diff --git a/reader-sdk-react-native-quickstart/android/build.gradle b/reader-sdk-react-native-quickstart/android/build.gradle index 0b8031c7..ca1825d1 100644 --- a/reader-sdk-react-native-quickstart/android/build.gradle +++ b/reader-sdk-react-native-quickstart/android/build.gradle @@ -28,8 +28,8 @@ buildscript { buildToolsVersion = "33.0.0" minSdkVersion = 24 compileSdkVersion = 34 - targetSdkVersion = 33 - readerSdkVersion = "1.7.4" + targetSdkVersion = 34 + readerSdkVersion = "1.7.7" ndkVersion = "21.4.7075529" kotlin_version ='1.8.21' } From 85c333fd236161870eba1e5d7c9955b229ea71f9 Mon Sep 17 00:00:00 2001 From: Nilay-squareup Date: Fri, 13 Sep 2024 17:58:18 +0530 Subject: [PATCH 3/7] update reader SDK iOS to 1.7.4 and react native reader SDK to 1.7.7 --- RNReaderSDK.podspec | 2 +- package.json | 2 +- .../app/src/main/java/com/rnreadersdksample/MainApplication.kt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/RNReaderSDK.podspec b/RNReaderSDK.podspec index bc048c42..0d5ad2af 100644 --- a/RNReaderSDK.podspec +++ b/RNReaderSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "RNReaderSDK" - s.version = "1.7.6" + s.version = "1.7.4" s.summary = "A React Native plugin for Square Reader SDK" s.description = <<-DESC A React Native plugin for Square Reader SDK diff --git a/package.json b/package.json index 5f77308b..6e3d9a4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-square-reader-sdk", - "version": "1.7.2", + "version": "1.7.7", "description": "A React Native plugin for Square Reader SDK", "homepage": "https://github.com/square/react-native-square-reader-sdk", "repository": { diff --git a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt index b5413198..f14d26aa 100644 --- a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt +++ b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt @@ -49,7 +49,6 @@ class MainApplication : Application(), ReactApplication { super.onCreate() SoLoader.init(this, /* native exopackage */false) ReaderSdk.initialize(this) - initializeFlipper(this, reactNativeHost.reactInstanceManager) } companion object { From a3b2577f6300f7432d7a9dfdc77436c6867b1866 Mon Sep 17 00:00:00 2001 From: Nilay-squareup Date: Mon, 16 Sep 2024 16:46:49 +0530 Subject: [PATCH 4/7] update changelog and readme for version bump --- CHANGELOG.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efb6bc8c..1ae2b9b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### v1.4.5 Apr 25, 2024 -* Upgrade Reader SDK version support to 1.7.6 for iOS +* Upgrade Reader SDK version support to 1.7.4 for iOS ### v1.4.4 Aug 16, 2023 diff --git a/README.md b/README.md index 11e7ec24..f4e54875 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This repo contains a React Native plugin for Square [Reader SDK]. Reader SDK for React Native supports the following native Reader SDK versions: - * iOS: 1.7.6 and above + * iOS: 1.7.4 and above * Android: 1.7.7 and above >This plugin loads latest version of native Reader SDK by default according to [update policy for Reader SDK]. From d2a81e00cfdf1272fafb280fd4badf6283b73098 Mon Sep 17 00:00:00 2001 From: Nilay-squareup Date: Tue, 17 Sep 2024 12:21:17 +0530 Subject: [PATCH 5/7] iOS OS version update to 17.0.1 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5da95534..113e7a30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,4 +75,4 @@ jobs: run: ruby <(curl https://connect.squareup.com/readersdk-installer) install --app-id ${{secrets.SQUARE_READER_SDK_APPLICATION_ID}} --repo-password ${{secrets.SQUARE_READER_SDK_REPOSITORY_PASSWORD}} --version 1.6.1 > /dev/null - name: Build iOS (debug) working-directory: ./reader-sdk-react-native-quickstart/ios - run: xcodebuild -workspace RNReaderSDKSample.xcworkspace -configuration Debug -scheme RNReaderSDKSample -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" + run: xcodebuild -workspace RNReaderSDKSample.xcworkspace -configuration Debug -scheme RNReaderSDKSample -destination "platform=iOS Simulator,OS=17.0.1,name=iPhone 14" From 53559480f20e69e12924c3fe281d8240a329f718 Mon Sep 17 00:00:00 2001 From: Nilay-squareup Date: Thu, 19 Sep 2024 16:05:07 +0530 Subject: [PATCH 6/7] resolved PR comments --- CHANGELOG.md | 6 +++++- RNReaderSDK.podspec | 2 +- reader-sdk-react-native-quickstart/android/app/build.gradle | 1 - .../src/main/java/com/rnreadersdksample/MainApplication.kt | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae2b9b1..97c2a3ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ ## Changelog +### v1.4.6 Sep 18, 2024 + +* Upgrade Reader SDK version support to 1.7.7 for iOS + ### v1.4.5 Apr 25, 2024 -* Upgrade Reader SDK version support to 1.7.4 for iOS +* Upgrade Reader SDK version support to 1.7.2 for iOS ### v1.4.4 Aug 16, 2023 diff --git a/RNReaderSDK.podspec b/RNReaderSDK.podspec index 0d5ad2af..110ad2fa 100644 --- a/RNReaderSDK.podspec +++ b/RNReaderSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "RNReaderSDK" - s.version = "1.7.4" + s.version = "1.7.7" s.summary = "A React Native plugin for Square Reader SDK" s.description = <<-DESC A React Native plugin for Square Reader SDK diff --git a/reader-sdk-react-native-quickstart/android/app/build.gradle b/reader-sdk-react-native-quickstart/android/app/build.gradle index 8d37ef1b..1490c477 100644 --- a/reader-sdk-react-native-quickstart/android/app/build.gradle +++ b/reader-sdk-react-native-quickstart/android/app/build.gradle @@ -220,7 +220,6 @@ dependencies { } // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - // implementation 'com.reactnative:react-native-square-reader-sdk:1.7.4' def readerSdkVersion = "1.7.7" implementation "com.squareup.sdk.reader:reader-sdk-$SQUARE_READER_SDK_APPLICATION_ID:$readerSdkVersion" runtimeOnly "com.squareup.sdk.reader:reader-sdk-internals:$readerSdkVersion" diff --git a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt index f14d26aa..7600575d 100644 --- a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt +++ b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt @@ -19,10 +19,9 @@ import com.facebook.react.ReactPackage import com.facebook.react.PackageList import com.facebook.soloader.SoLoader import com.rnreadersdksample.MainApplication - +import com.squareup.sdk.reader.ReaderSdk import android.content.Context import com.facebook.react.ReactInstanceManager -import com.squareup.sdk.reader.ReaderSdk import java.lang.ClassNotFoundException import java.lang.NoSuchMethodException import java.lang.IllegalAccessException From 33c7f4228d6d756fb78e1a4c571d39b6c7422d9b Mon Sep 17 00:00:00 2001 From: Nilay-squareup Date: Thu, 19 Sep 2024 16:15:08 +0530 Subject: [PATCH 7/7] updated one missing file --- .../app/src/main/java/com/rnreadersdksample/MainApplication.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt index 7600575d..ef61175e 100644 --- a/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt +++ b/reader-sdk-react-native-quickstart/android/app/src/main/java/com/rnreadersdksample/MainApplication.kt @@ -18,8 +18,8 @@ import com.facebook.react.ReactNativeHost import com.facebook.react.ReactPackage import com.facebook.react.PackageList import com.facebook.soloader.SoLoader -import com.rnreadersdksample.MainApplication import com.squareup.sdk.reader.ReaderSdk +import com.rnreadersdksample.MainApplication import android.content.Context import com.facebook.react.ReactInstanceManager import java.lang.ClassNotFoundException