Skip to content

Commit

Permalink
Fix build issues (#859)
Browse files Browse the repository at this point in the history
* iphone 15

* ios 17.2

* xcode 15.4

* latest ios

* xcode test 6

* bitrise recommended yml

* format

* latest bitrise

* prettier

* update unit-ios to run the script from workflow

* deploy to bitrise-io

* revert changes

* bootstrap pods

* revert that

* bundle update

* remove deploy to bitrise io

* fix unsafe gets
  • Loading branch information
nazli-stripe authored Dec 12, 2024
1 parent f08d724 commit 02d4997
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -895,9 +895,9 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
val toggle = array.getMap(i)
toggles.add(
Toggle(
toggle.getString("title"),
toggle.getString("description"),
if (toggle.getString("defaultValue") == "enabled") {
toggle?.getString("title"),
toggle?.getString("description"),
if (toggle?.getString("defaultValue") == "enabled") {
ToggleValue.ENABLED
} else {
ToggleValue.DISABLED
Expand All @@ -919,7 +919,7 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
val listInput = ArrayList<Input>()
for (i in 0 until collectInputs.size()) {
val collectInput = collectInputs.getMap(i)
when (collectInput.getString("formType")) {
when (collectInput?.getString("formType")) {
"text" -> {
collectInput.let {
var toggles = ArrayList<Toggle>()
Expand Down Expand Up @@ -1012,12 +1012,12 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
val button = array.getMap(i)
listSelectionButtons.add(
SelectionButton(
if (button.getString("style") == "primary") {
if (button?.getString("style") == "primary") {
SelectionButtonStyle.PRIMARY
} else {
SelectionButtonStyle.SECONDARY
},
button.getString("text") ?: ""
button?.getString("text") ?: ""
)
)
}
Expand Down
6 changes: 3 additions & 3 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@ workflows:
- complete_all
unit-ios:
steps:
- xcode-test@5:
- xcode-test@6:
inputs:
- project_path: dev-app/ios/StripeTerminalReactNativeDevApp.xcworkspace
- scheme: UnitTests
- destination: platform=iOS Simulator,name=iPhone 14,OS=latest
- destination: platform=iOS Simulator,name=iPhone 15,OS=latest
- command: yarn unit-test:ios
- cache_local_deps: 'yes'
title: xcodebuild iOS Unit Tests
Expand All @@ -276,7 +276,7 @@ workflows:
- complete_all
meta:
bitrise.io:
stack: osx-xcode-15.2.x
stack: osx-xcode-15.4.x
machine_type_id: g2.mac.large
app:
envs:
Expand Down
9 changes: 4 additions & 5 deletions dev-app/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,28 +75,27 @@ GEM
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.3.6)
strscan
rexml (3.3.9)
ruby-macho (2.5.1)
strscan (3.1.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.25.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (>= 3.3.2, < 4.0)
rexml (>= 3.3.6, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 6.1.7.3, < 7.1.0)
cocoapods (~> 1.15.2)
xcodeproj (= 1.25.1)

RUBY VERSION
ruby 3.2.3p157
Expand Down

0 comments on commit 02d4997

Please sign in to comment.