Skip to content

Commit

Permalink
Merge branch 'feat/ACC-3019-ACC-3020-ACC-3022/ACH-react-native-androi…
Browse files Browse the repository at this point in the history
…d-and-shared-code' of https://github.com/primer-io/primer-sdk-react-native into feat/ACC-3333-ACH-drop-in
  • Loading branch information
FlaviuExtPrimer committed Jul 23, 2024
2 parents bd03c46 + c262c34 commit d7e559d
Show file tree
Hide file tree
Showing 45 changed files with 1,771 additions and 345 deletions.
19 changes: 9 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GEM
base64
nkf
rexml
activesupport (7.1.2)
activesupport (7.1.3.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -40,12 +40,12 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
bigdecimal (3.1.4)
bigdecimal (3.1.8)
claide (1.1.0)
cocoapods (1.14.3)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.3)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -60,7 +60,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.3)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -83,15 +83,14 @@ GEM
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
declarative (0.0.20)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.16.0)
Expand Down Expand Up @@ -221,7 +220,7 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
json (2.7.2)
Expand All @@ -232,7 +231,7 @@ GEM
mime-types-data (3.2024.0507)
mini_magick (4.12.0)
mini_mime (1.1.5)
minitest (5.20.0)
minitest (5.23.1)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.4.1)
Expand Down
4 changes: 2 additions & 2 deletions packages/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ dependencies {

implementation project(':primerioreactnative')

implementation "io.primer:3ds-android:1.4.2"
implementation "io.primer:3ds-android:1.4.3"
implementation "io.primer:ipay88-my-android:1.0.3"
implementation "io.primer:klarna-android:1.0.4"
implementation "io.primer:stripe-android:1.1.0" // TODO TWS: use release version
implementation "io.primer:stripe-android:1.0.0"

implementation project(path: ':primerioreactnative')

Expand Down
2 changes: 1 addition & 1 deletion packages/example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ target 'example_0_70_6' do
if target.name == "primer-io-react-native" || target.name == "PrimerSDK"
target.build_configurations.each do |config|
config.build_settings['SWIFT_INCLUDE_PATHS'] = "$(inherited) ${PODS_CONFIGURATION_BUILD_DIR}/Primer3DS ${PODS_CONFIGURATION_BUILD_DIR}/PrimerKlarnaSDK ${PODS_CONFIGURATION_BUILD_DIR}/PrimerIPay88MYSDK"
config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Primer3DS/Primer3DS.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/PrimerIPay88MYSDK/PrimerIPay88MYSDK.modulemap"'
config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Primer3DS/Primer3DS.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/PrimerIPay88MYSDK/PrimerIPay88MYSDK.modulemap"'

config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -weak_library -l"Primer3DS" -l"PrimerKlarnaSDK" -l"PrimerIPay88MYSDK"'
end
Expand Down
18 changes: 9 additions & 9 deletions packages/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ PODS:
- ReactCommon/turbomodule/core (= 0.72.0)
- fmt (6.2.1)
- glog (0.3.5)
- primer-io-react-native (2.21.1):
- PrimerSDK (= 2.26.0)
- primer-io-react-native (2.25.0):
- PrimerSDK (= 2.27.0)
- React-Core
- Primer3DS (2.3.2)
- PrimerIPay88MYSDK (0.1.7)
- PrimerKlarnaSDK (1.1.0)
- PrimerSDK (2.26.0):
- PrimerSDK/Core (= 2.26.0)
- PrimerSDK/Core (2.26.0)
- PrimerSDK (2.27.0):
- PrimerSDK/Core (= 2.27.0)
- PrimerSDK/Core (2.27.0)
- RCT-Folly (2021.07.22.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -418,7 +418,7 @@ DEPENDENCIES:
- primer-io-react-native (from `../../sdk`)
- Primer3DS
- PrimerIPay88MYSDK
- PrimerKlarnaSDK
- PrimerKlarnaSDK (= 1.1.0)
- PrimerSDK
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
Expand Down Expand Up @@ -566,11 +566,11 @@ SPEC CHECKSUMS:
FBReactNativeSpec: 6e7e74b1ed7f0a1a469a82a67521b33285f5fef3
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
primer-io-react-native: 01b45d80b85c286c800133a94ffb86cbb45d231a
primer-io-react-native: 8f5a31d699b11d1fe9538fb6f4c8f08f22dc00dd
Primer3DS: 81e7969033230c7346a517cd609be956914738bb
PrimerIPay88MYSDK: 436ee0be7e2c97e4e81456ccddee20175e9e3c4d
PrimerKlarnaSDK: 83e9a1357a7247bf8fa2836fc945cf97644d601d
PrimerSDK: ffa6b212c08cab4157bae5f89566ad9f89f2d613
PrimerSDK: d602d8492ad2b6d04a8ee36274d9756d8ad79a67
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
RCTRequired: 656ef0536dd60a9740961ade6a64ba0cb0572d2b
RCTTypeSafety: 82bd23b63f043d1a6b8e80e72fd15c08e04528a4
Expand Down Expand Up @@ -611,6 +611,6 @@ SPEC CHECKSUMS:
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Yoga: 1d6727ed193122f6adaf435c3de1a768326ff83b

PODFILE CHECKSUM: fd89a66fa0d850b0f330025172d1f42e4f16a3f5
PODFILE CHECKSUM: 52db9ce2025ee0ab78fb1f3cf545403d3fa848fc

COCOAPODS: 1.15.2
Loading

0 comments on commit d7e559d

Please sign in to comment.