Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump SDKs to 3.8.0 #775

Merged
merged 3 commits into from
Aug 7, 2024
Merged

Bump SDKs to 3.8.0 #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f81aa17
bump SDKs to 3.8.0
ianlin-bbpos Aug 2, 2024
5694fae
bump iOS to 3.8.1
ianlin-bbpos Aug 7, 2024
f4bc803
Merge branch 'main' into bbpos/bump-sdks-to-3.8.0
ianlin-bbpos Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def getExtOrIntegerDefault(name) {
return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['StripeTerminalReactNative_' + name]).toInteger()
}

def terminalAndroidSdkVersion = '3.7.1'
def terminalAndroidSdkVersion = '3.8.0'
def reactNativeSdkVersion = getVersionFromNpm()

android {
Expand Down
4 changes: 4 additions & 0 deletions android/src/main/java/com/stripeterminalreactnative/Mappers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ internal fun mapFromDeviceType(type: DeviceType): String {
DeviceType.STRIPE_M2 -> "stripeM2"
DeviceType.STRIPE_S700 -> "stripeS700"
DeviceType.STRIPE_S700_DEVKIT -> "stripeS700Devkit"
DeviceType.STRIPE_S710 -> "stripeS710"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these not needed for iOS?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but iOS does't support S710 yet by v3.8.0.

DeviceType.STRIPE_S710_DEVKIT -> "stripeS710Devkit"
DeviceType.UNKNOWN -> "unknown"
DeviceType.VERIFONE_P400 -> "verifoneP400"
DeviceType.WISECUBE -> "wiseCube"
Expand All @@ -161,6 +163,8 @@ internal fun mapToDeviceType(type: String): DeviceType? {
"stripeM2" -> DeviceType.STRIPE_M2
"stripeS700" -> DeviceType.STRIPE_S700
"stripeS700Devkit" -> DeviceType.STRIPE_S700_DEVKIT
"stripeS710" -> DeviceType.STRIPE_S710
"stripeS710Devkit" -> DeviceType.STRIPE_S710_DEVKIT
"verifoneP400" -> DeviceType.VERIFONE_P400
"wiseCube" -> DeviceType.WISECUBE
"wisePad3" -> DeviceType.WISEPAD_3
Expand Down
10 changes: 5 additions & 5 deletions dev-app/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,11 +440,11 @@ PODS:
- SocketRocket (0.6.1)
- stripe-terminal-react-native (0.0.1-beta.20):
- React-Core
- StripeTerminal (~> 3.7.0)
- StripeTerminal (~> 3.8.1)
- stripe-terminal-react-native/Tests (0.0.1-beta.20):
- React-Core
- StripeTerminal (~> 3.7.0)
- StripeTerminal (3.7.0)
- StripeTerminal (~> 3.8.1)
- StripeTerminal (3.8.1)
- Yoga (1.14.0)

DEPENDENCIES:
Expand Down Expand Up @@ -644,8 +644,8 @@ SPEC CHECKSUMS:
RNGestureHandler: 32a01c29ecc9bb0b5bf7bc0a33547f61b4dc2741
RNScreens: 3c2d122f5e08c192e254c510b212306da97d2581
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
stripe-terminal-react-native: 319a20a3c4bfbe87ef68959222ed7914cbc5e15d
StripeTerminal: 7188b9f8bb3f3c9f0ad5f18217f26ccb07001988
stripe-terminal-react-native: 88b439710351cde325e1916c862878eb7b1f78ed
StripeTerminal: 79618e96297bf13eee53177c6888abb0b99c5958
Yoga: 4c3aa327e4a6a23eeacd71f61c81df1bcdf677d5

PODFILE CHECKSUM: e42df060dac549df682e535ef903a0f36c3e799c
Expand Down
2 changes: 2 additions & 0 deletions src/types/Reader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ export namespace Reader {
| 'wisePadEDevkit'
| 'stripeS700Devkit'
| 'stripeS700'
| 'stripeS710Devkit'
| 'stripeS710'
| 'cotsDevice'
| 'appleBuiltIn'
| 'etna';
Expand Down
2 changes: 1 addition & 1 deletion stripe-terminal-react-native.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ Pod::Spec.new do |s|
end

s.dependency 'React-Core'
s.dependency 'StripeTerminal', '~> 3.7.0'
s.dependency 'StripeTerminal', '~> 3.8.1'
end