Skip to content

Commit

Permalink
Bump SDK to 3.3.1 & fix Bitrise test issue (#622)
Browse files Browse the repository at this point in the history
* bump sdk to 3.3.1 .

* disable Jetifier.

* try to fix Bitrise test failed issue.

* try another workaround.

* update ruby version.

* update ruby version in dev-app

* revert ruby version, deploy artifact

* adjust position.

* bump ruby to 3.2.3

* update gem & cocoapods.

* remove artifacts deploy.
  • Loading branch information
ianlin-bbpos authored Feb 21, 2024
1 parent 5dc2fdc commit e124b29
Show file tree
Hide file tree
Showing 10 changed files with 805 additions and 976 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
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.2.1'
def terminalAndroidSdkVersion = '3.3.1'
def reactNativeSdkVersion = getVersionFromNpm()

android {
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ StripeTerminalReactNative_compileSdkVersion=34
StripeTerminalReactNative_kotlinVersion=1.8.21
StripeTerminalReactNative_targetSdkVersion=33
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false

org.gradle.parallel=true
org.gradle.daemon=true
Expand Down
2 changes: 1 addition & 1 deletion bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ workflows:
- content: |-
set -e
# This is a terrible hack, as I haven't worked out how Bitrise's `pod install` step interacts with the rbenv set in this app. You definitely shouldn't copy this.
cd dev-app/ios && asdf install ruby 3.2.2 && bundle install && \
cd dev-app/ios && asdf install ruby 3.2.3 && bundle install && \
gem install cocoapods -v 1.14.2 && pod install && cd - && \
npm rebuild detox
echo "Checking for diffs in pod lockfile, if this fails please ensure all dependencies are up to date" && \
Expand Down
2 changes: 1 addition & 1 deletion dev-app/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.2.3
4 changes: 2 additions & 2 deletions dev-app/Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '3.2.2'
gem 'cocoapods', '~> 1.14.2'
ruby '3.2.3'
gem 'cocoapods', '~> 1.15.2'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
26 changes: 15 additions & 11 deletions dev-app/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (7.0.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
claide (1.1.0)
cocoapods (1.14.2)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.2)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
Expand All @@ -33,7 +36,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.2)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -44,7 +47,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.0)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
Expand All @@ -64,20 +67,21 @@ GEM
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.6.3)
json (2.7.1)
minitest (5.20.0)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
ruby-macho (2.5.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.23.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -90,10 +94,10 @@ PLATFORMS

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

RUBY VERSION
ruby 3.2.2p53
ruby 3.2.3p157

BUNDLED WITH
2.1.4
2 changes: 1 addition & 1 deletion dev-app/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
# org.gradle.parallel=true

android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
android.defaults.buildfeatures.buildconfig=true
FLIPPER_VERSION=0.182.0
# Use this property to specify which architecture you want to build.
Expand Down
10 changes: 5 additions & 5 deletions dev-app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,8 @@ PODS:
- SocketRocket (0.6.1)
- stripe-terminal-react-native (0.0.1-beta.15):
- React-Core
- StripeTerminal (~> 3.2.1)
- StripeTerminal (3.2.1)
- StripeTerminal (~> 3.3.1)
- StripeTerminal (3.3.1)
- Yoga (1.14.0)
- YogaKit (1.18.1):
- Yoga (~> 1.14)
Expand Down Expand Up @@ -745,11 +745,11 @@ SPEC CHECKSUMS:
RNGestureHandler: 32a01c29ecc9bb0b5bf7bc0a33547f61b4dc2741
RNScreens: 3c2d122f5e08c192e254c510b212306da97d2581
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
stripe-terminal-react-native: 5cabef59a3437f041e0e3d00a9883b7327586940
StripeTerminal: 420b64bada15fae3b47946662793ae099acb5ed6
stripe-terminal-react-native: e04fc122f767fb271aefcd4e408719a62dbdcce7
StripeTerminal: 369ef0cf0b90d838f42be1a0b371475986f4b79f
Yoga: 4c3aa327e4a6a23eeacd71f61c81df1bcdf677d5
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: de841687794391434f9be4d2208326533128ef1e

COCOAPODS: 1.14.2
COCOAPODS: 1.15.2
Loading

0 comments on commit e124b29

Please sign in to comment.