Skip to content

Commit

Permalink
Merge pull request #20 from dojo-engineering/version-bump
Browse files Browse the repository at this point in the history
Version bump
  • Loading branch information
deniss-kaibagarovs authored Nov 11, 2024
2 parents 3b6cd37 + 0e2ad71 commit e7ef322
Show file tree
Hide file tree
Showing 9 changed files with 128 additions and 131 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ dependencies {
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "tech.dojo.pay:uisdk:1.5.0"
implementation "tech.dojo.pay:uisdk:1.6.1"
implementation "tech.dojo.pay:sdk:1.7.2"
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.4.+'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,20 @@ class DojoReactNativePaySdkModule internal constructor(context: ReactApplication
val showBranding =
if (details.hasKey(SHOW_BRANDING)) details.getBoolean(SHOW_BRANDING) else true
val mustCompleteBy = details.getString(MUST_COMPLETE_BY)
val additionalLegalText = details.getString(ADDITIONAL_LEGAL_TEXT)
var backdropViewColor = details.getString(BACKDROP_VIEW_COLOR)
var backdropViewAlpha =
if (details.hasKey(BACKDROP_VIEW_ALPHA)) details.getDouble(BACKDROP_VIEW_ALPHA) else null

val additionalLegalText = details.getString(ADDITIONAL_LEGAL_TEXT)
val customCardDetailsNavigationTitle = details.getString(CUSTOM_CARD_DETAILS_NAVIGATION_TITLE)
val customResultScreenTitleSuccess = details.getString(CUSTOM_RESULT_TITLE_SCREEN_SUCCESS)
val customResultScreenTitleFail = details.getString(CUSTOM_RESULT_TITLE_FAIL)
val customResultScreenOrderIdText = details.getString(CUSTOM_RESULT_ORDER_ID_TEXT)
val customResultScreenMainTextSuccess = details.getString(CUSTOM_RESULT_MAIN_TEXT_SUCCESS)
val customResultScreenMainTextFail = details.getString(CUSTOM_RESULT_MAIN_TEXT_FAIL)
val customResultScreenAdditionalTextSuccess = details.getString(CUSTOM_RESULT_ADDITIONAL_TEXT_SUCCESS)
val customResultScreenAdditionalTextFail = details.getString(CUSTOM_RESULT_ADDITIONAL_TEXT_FAIL)

val gPayConfig = if (
gPayMerchantId !== null &&
gPayMerchantName !== null &&
Expand Down Expand Up @@ -94,6 +103,38 @@ class DojoReactNativePaySdkModule internal constructor(context: ReactApplication
DojoSDKDropInUI.dojoThemeSettings?.additionalLegalText = additionalLegalText
}

if (!customCardDetailsNavigationTitle.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customCardDetailsNavigationTitle = customCardDetailsNavigationTitle
}

if (!customResultScreenTitleSuccess.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customResultScreenTitleSuccess = customResultScreenTitleSuccess
}

if (!customResultScreenTitleFail.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customResultScreenTitleFail = customResultScreenTitleFail
}

if (!customResultScreenOrderIdText.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customResultScreenOrderIdText = customResultScreenOrderIdText
}

if (!customResultScreenMainTextSuccess.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customResultScreenMainTextSuccess = customResultScreenMainTextSuccess
}

if (!customResultScreenMainTextFail.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customResultScreenMainTextFail = customResultScreenMainTextFail
}

if (!customResultScreenAdditionalTextSuccess.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customResultScreenAdditionalTextSuccess = customResultScreenAdditionalTextSuccess
}

if (!customResultScreenAdditionalTextFail.isNullOrEmpty()) {
DojoSDKDropInUI.dojoThemeSettings?.customResultScreenAdditionalTextFail = customResultScreenAdditionalTextFail
}

if (mustCompleteBy != null) {
DojoPay.startExpiryTimer(mustCompleteBy, reactApplicationContext)
}
Expand Down Expand Up @@ -194,5 +235,15 @@ class DojoReactNativePaySdkModule internal constructor(context: ReactApplication
const val ADDITIONAL_LEGAL_TEXT = "additionalLegalText"
const val BACKDROP_VIEW_COLOR = "backdropViewColor"
const val BACKDROP_VIEW_ALPHA = "backdropViewAlpha"


const val CUSTOM_CARD_DETAILS_NAVIGATION_TITLE = "customCardDetailsNavigationTitle"
const val CUSTOM_RESULT_TITLE_SCREEN_SUCCESS = "customResultScreenTitleSuccess"
const val CUSTOM_RESULT_TITLE_FAIL = "customResultScreenTitleFail"
const val CUSTOM_RESULT_ORDER_ID_TEXT = "customResultScreenOrderIdText"
const val CUSTOM_RESULT_MAIN_TEXT_SUCCESS = "customResultScreenMainTextSuccess"
const val CUSTOM_RESULT_MAIN_TEXT_FAIL = "customResultScreenMainTextFail"
const val CUSTOM_RESULT_ADDITIONAL_TEXT_SUCCESS = "customResultScreenAdditionalTextSuccess"
const val CUSTOM_RESULT_ADDITIONAL_TEXT_FAIL = "customResultScreenAdditionalTextFail"
}
}
2 changes: 1 addition & 1 deletion dojo-react-native-pay-sdk.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Pod::Spec.new do |s|
s.dependency "React-Core"

# Dojo iOS SDK Dependencies
s.dependency 'dojo-ios-sdk-drop-in-ui', '1.4.3'
s.dependency 'dojo-ios-sdk-drop-in-ui', '1.4.4'
s.dependency 'dojo-ios-sdk', '1.4.2'

# Don't install the dependencies when we run `pod install` in the old architecture.
Expand Down
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ dependencies {

implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")

implementation("tech.dojo.pay:uisdk:1.5.0")
implementation("tech.dojo.pay:uisdk:1.6.1")
implementation("tech.dojo.pay:sdk:1.7.2")

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
Expand Down
11 changes: 9 additions & 2 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

pod 'dojo-ios-sdk', :git => '[email protected]:Dojo-Engineering/dojo-ios-sdk.git', :tag => '1.4.2'
pod 'dojo-ios-sdk-drop-in-ui', :git => '[email protected]:dojo-engineering/dojo-ios-sdk-drop-in-ui.git', :tag => '1.4.3'
pod 'dojo-ios-sdk-drop-in-ui', :git => '[email protected]:dojo-engineering/dojo-ios-sdk-drop-in-ui.git', :tag => '1.4.4'

platform :ios, min_ios_version_supported
prepare_react_native_project!
Expand All @@ -16,7 +16,7 @@ prepare_react_native_project!
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
flipper_config = FlipperConfiguration.disabled

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Expand Down Expand Up @@ -51,6 +51,13 @@ target 'DojoReactNativePaySdkExample' do
# Pods for testing
end

# post_install do |installer|
# installer.pods_project.build_configurations.each do |config|
# config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
# end
# end


post_install do |installer|
react_native_post_install(
installer,
Expand Down
133 changes: 9 additions & 124 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
PODS:
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- dojo-ios-sdk (1.4.2)
- dojo-ios-sdk-drop-in-ui (1.4.2):
- dojo-ios-sdk-drop-in-ui (1.4.4):
- dojo-ios-sdk (= 1.4.2)
- dojo-react-native-pay-sdk (0.13.0):
- dojo-react-native-pay-sdk (0.15.0):
- dojo-ios-sdk (= 1.4.2)
- dojo-ios-sdk-drop-in-ui (= 1.4.2)
- dojo-ios-sdk-drop-in-ui (= 1.4.4)
- React-Core
- DoubleConversion (1.1.6)
- FBLazyVector (0.71.8)
Expand All @@ -17,74 +16,12 @@ PODS:
- React-Core (= 0.71.8)
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- Flipper (0.125.0):
- Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.4)
- Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.2.0.1)
- Flipper-Fmt (7.1.7)
- Flipper-Folly (2.6.10):
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog
- libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.1100)
- Flipper-Glog (0.5.0.5)
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.6)
- FlipperKit (0.125.0):
- FlipperKit/Core (= 0.125.0)
- FlipperKit/Core (0.125.0):
- Flipper (~> 0.125.0)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- SocketRocket (~> 0.6.0)
- FlipperKit/CppBridge (0.125.0):
- Flipper (~> 0.125.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
- Flipper-Folly (~> 2.6)
- FlipperKit/FBDefines (0.125.0)
- FlipperKit/FKPortForwarding (0.125.0):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.125.0)
- FlipperKit/FlipperKitLayoutHelpers (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutIOSDescriptors
- FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
- FlipperKit/FlipperKitNetworkPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1)
- glog (0.3.5)
- hermes-engine (0.71.8):
- hermes-engine/Pre-built (= 0.71.8)
- hermes-engine/Pre-built (0.71.8)
- libevent (2.1.12)
- OpenSSL-Universal (1.1.1100)
- RCT-Folly (2021.07.22.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -458,52 +395,26 @@ PODS:
- RNScreens (3.24.0):
- React-Core
- React-RCTImage
- SocketRocket (0.6.0)
- Yoga (1.14.0)
- YogaKit (1.18.1):
- Yoga (~> 1.14)

DEPENDENCIES:
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- "dojo-ios-sdk (from `[email protected]:Dojo-Engineering/dojo-ios-sdk.git`, tag `1.4.2`)"
- "dojo-ios-sdk-drop-in-ui (from `[email protected]:dojo-engineering/dojo-ios-sdk-drop-in-ui.git`, tag `1.4.2`)"
- "dojo-ios-sdk-drop-in-ui (from `[email protected]:dojo-engineering/dojo-ios-sdk-drop-in-ui.git`, tag `1.4.4`)"
- dojo-react-native-pay-sdk (from `../..`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- Flipper (= 0.125.0)
- Flipper-Boost-iOSX (= 1.76.0.1.11)
- Flipper-DoubleConversion (= 3.2.0.1)
- Flipper-Fmt (= 7.1.7)
- Flipper-Folly (= 2.6.10)
- Flipper-Glog (= 0.5.0.5)
- Flipper-PeerTalk (= 0.0.4)
- Flipper-RSocket (= 1.4.3)
- FlipperKit (= 0.125.0)
- FlipperKit/Core (= 0.125.0)
- FlipperKit/CppBridge (= 0.125.0)
- FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
- FlipperKit/FBDefines (= 0.125.0)
- FlipperKit/FKPortForwarding (= 0.125.0)
- FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
- FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
- FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
- FlipperKit/FlipperKitReactPlugin (= 0.125.0)
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
- FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
- libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.1100)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../node_modules/react-native/`)
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
- React-Codegen (from `build/generated/ios`)
- React-Core (from `../node_modules/react-native/`)
- React-Core/DevSupport (from `../node_modules/react-native/`)
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
Expand Down Expand Up @@ -534,21 +445,8 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- CocoaAsyncSocket
- Flipper
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
- Flipper-RSocket
- FlipperKit
- fmt
- libevent
- OpenSSL-Universal
- SocketRocket
- YogaKit

EXTERNAL SOURCES:
boost:
Expand All @@ -558,7 +456,7 @@ EXTERNAL SOURCES:
:tag: 1.4.2
dojo-ios-sdk-drop-in-ui:
:git: "[email protected]:dojo-engineering/dojo-ios-sdk-drop-in-ui.git"
:tag: 1.4.2
:tag: 1.4.4
dojo-react-native-pay-sdk:
:path: "../.."
DoubleConversion:
Expand Down Expand Up @@ -644,31 +542,20 @@ CHECKOUT OPTIONS:
:tag: 1.4.2
dojo-ios-sdk-drop-in-ui:
:git: "[email protected]:dojo-engineering/dojo-ios-sdk-drop-in-ui.git"
:tag: 1.4.2
:tag: 1.4.4

SPEC CHECKSUMS:
boost: 57d2868c099736d80fcd648bf211b4431e51a558
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
dojo-ios-sdk: 8518ed98a2d2e26830ecd50455697e87a68d66c0
dojo-ios-sdk-drop-in-ui: 9445553dbb11e553ffa98257746a78678ab5e1cd
dojo-react-native-pay-sdk: 3502c0b40f9cbbefca0e84a81b486d9e89ef6a21
dojo-ios-sdk-drop-in-ui: a44d1c87b2da9b1fe6bb2f5b3b8b7f184ac4f0f6
dojo-react-native-pay-sdk: fbec23229128123a687565596b0b9021b59efc86
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
FBLazyVector: f637f31eacba90d4fdeff3fa41608b8f361c173b
FBReactNativeSpec: 0d9a4f4de7ab614c49e98c00aedfd3bfbda33d59
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a
RCTTypeSafety: bee9dd161c175896c680d47ef1d9eaacf2b587f4
Expand Down Expand Up @@ -701,10 +588,8 @@ SPEC CHECKSUMS:
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNReanimated: 49cdb63e767bb7e743ff4c12f7d85722c0d008f2
RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 90ce715bccdf3ef0de53150e0827a9205605d2b9
PODFILE CHECKSUM: b049ff1099e155bad0451cfeaa0c87a68fbd98ae

COCOAPODS: 1.15.2
Loading

0 comments on commit e7ef322

Please sign in to comment.