Skip to content

Commit

Permalink
updates sdk to fix multiple passenger validation issue
Browse files Browse the repository at this point in the history
  • Loading branch information
abmomen committed Jul 8, 2023
1 parent 3b6f425 commit ab9a040
Show file tree
Hide file tree
Showing 28 changed files with 83 additions and 410 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
1. Add the following pod to your `Podfile`:

```ruby
pod 'ShareTripSDK', :git => 'https://github.com/sharetripnet/ShareTripSDK.git', :tag => '1.0.8'
pod 'ShareTripSDK', :git => 'https://github.com/sharetripnet/ShareTripSDK.git', :tag => '1.0.9'
```

2. If not already added, add `use_frameworks!` to your `Podfile`.
Expand Down
4 changes: 2 additions & 2 deletions STExample/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ PODS:
- PromisesObjC (2.2.0)
- PromisesSwift (2.2.0):
- PromisesObjC (= 2.2.0)
- ShareTripSDK (1.0.8)
- ShareTripSDK (1.0.9)
- Socket.IO-Client-Swift (16.0.1):
- Starscream (~> 4.0)
- Starscream (4.0.4)
Expand Down Expand Up @@ -994,7 +994,7 @@ SPEC CHECKSUMS:
pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959
ShareTripSDK: e9188d38f8f8a710fd065fb584ab87d153b70a94
ShareTripSDK: 61c33685ccc91782e227236320844cb339c0d9d1
Socket.IO-Client-Swift: c116d6dc9fd6be9c259bacfe143f8725bce7d79e
Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
Expand Down
2 changes: 2 additions & 0 deletions STExample/STExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
CCC181EB298A4C070086426D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
CCC181ED298A4C070086426D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
CCC181F3298A4F760086426D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
CCE1C8E72A3B36D400C3DDD3 /* AdServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdServices.framework; path = System/Library/Frameworks/AdServices.framework; sourceTree = SDKROOT; };
E1FCB6EA7D125AD0475DE4C6 /* Pods-STExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-STExample.release.xcconfig"; path = "Target Support Files/Pods-STExample/Pods-STExample.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -42,6 +43,7 @@
7237899E94518BF606195FA8 /* Frameworks */ = {
isa = PBXGroup;
children = (
CCE1C8E72A3B36D400C3DDD3 /* AdServices.framework */,
CC4C3A2829BDCF8B00FE67A1 /* Lottie.framework */,
CC4C3A2429BDCECC00FE67A1 /* Lottie.framework */,
3EF07142EAA2435367F6D423 /* Pods_STExample.framework */,
Expand Down
3 changes: 2 additions & 1 deletion STExample/STExample/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISceneDelegate {
IQKeyboardManager.shared.enable = true

STSDK.shared.delegate = self
STSDK.shared.accessToken = "$2b$10$pv.ZAnzyuSTD7GIMm/yHL.hdPTFQgUDN2rfXPnQXh67e4JsKJ0Fl."
STSDK.shared.environment = .live
STSDK.shared.accessToken = "valid access token"
self.window?.rootViewController = UINavigationController(rootViewController: STSDKHomeVC.instantiate())
window?.makeKeyAndVisible()

Expand Down
2 changes: 1 addition & 1 deletion ShareTripSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ShareTripSDK'
s.version = '1.0.8'
s.version = '1.0.9'
s.summary = 'ShareTripSDK'
s.homepage = 'https://github.com/sharetripnet/ShareTripSDK.git'
s.source = { :git => 'https://github.com/sharetripnet/ShareTripSDK.git', :tag => s.version.to_s }
Expand Down
10 changes: 5 additions & 5 deletions ShareTripSDK.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>ShareTripSDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>ShareTripSDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if 0
#elif defined(__arm64__) && __arm64__
// Generated by Apple Swift version 5.8 (swiftlang-5.8.0.124.2 clang-1403.0.22.11.100)
// Generated by Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
#ifndef SHARETRIPSDK_SWIFT_H
#define SHARETRIPSDK_SWIFT_H
#pragma clang diagnostic push
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -137370,114 +137370,14 @@
]
},
{
"kind": "TypeDecl",
"name": "FlightPassengerInfoValidator",
"printedName": "FlightPassengerInfoValidator",
"children": [
{
"kind": "Function",
"name": "isOptional",
"printedName": "isOptional(rowType:isPrimaryPassenger:isDomesticFlight:isAttachmentAvailable:)",
"children": [
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
},
{
"kind": "TypeNominal",
"name": "UserInfoRowType",
"printedName": "ShareTripSDK.UserInfoRowType",
"usr": "s:12ShareTripSDK15UserInfoRowTypeO"
},
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
},
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
},
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
}
],
"declKind": "Func",
"usr": "s:12ShareTripSDK28FlightPassengerInfoValidatorC10isOptional7rowType0h7PrimaryE00h8DomesticD00H19AttachmentAvailableSbAA04Userf3RowK0O_S3btFZ",
"mangledName": "$s12ShareTripSDK28FlightPassengerInfoValidatorC10isOptional7rowType0h7PrimaryE00h8DomesticD00H19AttachmentAvailableSbAA04Userf3RowK0O_S3btFZ",
"moduleName": "ShareTripSDK",
"static": true,
"declAttributes": [
"Final",
"AccessControl"
],
"funcSelfKind": "NonMutating"
},
{
"kind": "Function",
"name": "isValid",
"printedName": "isValid(passengerInfo:isPrimaryPassenger:isDomesticFlight:isAttachmentAvailable:)",
"children": [
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
},
{
"kind": "TypeNominal",
"name": "PassengersBookingInformation",
"printedName": "ShareTripSDK.PassengersBookingInformation",
"usr": "s:12ShareTripSDK28PassengersBookingInformationC"
},
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
},
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
},
{
"kind": "TypeNominal",
"name": "Bool",
"printedName": "Swift.Bool",
"usr": "s:Sb"
}
],
"declKind": "Func",
"usr": "s:12ShareTripSDK28FlightPassengerInfoValidatorC7isValid09passengerF00h7PrimaryE00h8DomesticD00H19AttachmentAvailableSbAA28PassengersBookingInformationC_S3btFZ",
"mangledName": "$s12ShareTripSDK28FlightPassengerInfoValidatorC7isValid09passengerF00h7PrimaryE00h8DomesticD00H19AttachmentAvailableSbAA28PassengersBookingInformationC_S3btFZ",
"moduleName": "ShareTripSDK",
"static": true,
"declAttributes": [
"Final",
"AccessControl"
],
"funcSelfKind": "NonMutating"
}
],
"declKind": "Class",
"usr": "s:12ShareTripSDK28FlightPassengerInfoValidatorC",
"mangledName": "$s12ShareTripSDK28FlightPassengerInfoValidatorC",
"kind": "Import",
"name": "Foundation",
"printedName": "Foundation",
"declKind": "Import",
"moduleName": "ShareTripSDK",
"declAttributes": [
"AccessControl",
"RawDocComment"
],
"hasMissingDesignatedInitializers": true
]
},
{
"kind": "Import",
Expand Down Expand Up @@ -252678,14 +252578,14 @@
{
"filePath": "\/Users\/st-ios\/Workspace\/ShareTrip-iOS\/Development-SDK\/STSDK\/ShareTripSDK\/STFlightKit\/Models\/Validators\/FlightPassengerInfoValidator.swift",
"kind": "BooleanLiteral",
"offset": 1978,
"offset": 1764,
"length": 5,
"value": "false"
},
{
"filePath": "\/Users\/st-ios\/Workspace\/ShareTrip-iOS\/Development-SDK\/STSDK\/ShareTripSDK\/STFlightKit\/Models\/Validators\/FlightPassengerInfoValidator.swift",
"kind": "BooleanLiteral",
"offset": 2035,
"offset": 1809,
"length": 4,
"value": "true"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// swift-interface-format-version: 1.0
// swift-compiler-version: Apple Swift version 5.8 (swiftlang-5.8.0.124.2 clang-1403.0.22.11.100)
// swift-compiler-version: Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name ShareTripSDK
// swift-module-flags-ignorable: -enable-bare-slash-regex
import Alamofire
Expand Down Expand Up @@ -4299,11 +4299,6 @@ public enum ServiceType : Swift.String, Swift.Codable {
@_Concurrency.MainActor(unsafe) @objc required dynamic public init?(coder: Foundation.NSCoder)
@objc deinit
}
@_hasMissingDesignatedInitializers public class FlightPassengerInfoValidator {
public static func isOptional(rowType: ShareTripSDK.UserInfoRowType, isPrimaryPassenger: Swift.Bool, isDomesticFlight: Swift.Bool, isAttachmentAvailable: Swift.Bool) -> Swift.Bool
public static func isValid(passengerInfo: ShareTripSDK.PassengersBookingInformation, isPrimaryPassenger: Swift.Bool, isDomesticFlight: Swift.Bool, isAttachmentAvailable: Swift.Bool) -> Swift.Bool
@objc deinit
}
public struct GenderSelectionCellData : ShareTripSDK.ConfigurableTableViewCellData {
public let title: Swift.String
public let selectedGender: ShareTripSDK.GenderType
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// swift-interface-format-version: 1.0
// swift-compiler-version: Apple Swift version 5.8 (swiftlang-5.8.0.124.2 clang-1403.0.22.11.100)
// swift-compiler-version: Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name ShareTripSDK
// swift-module-flags-ignorable: -enable-bare-slash-regex
import Alamofire
Expand Down Expand Up @@ -4299,11 +4299,6 @@ public enum ServiceType : Swift.String, Swift.Codable {
@_Concurrency.MainActor(unsafe) @objc required dynamic public init?(coder: Foundation.NSCoder)
@objc deinit
}
@_hasMissingDesignatedInitializers public class FlightPassengerInfoValidator {
public static func isOptional(rowType: ShareTripSDK.UserInfoRowType, isPrimaryPassenger: Swift.Bool, isDomesticFlight: Swift.Bool, isAttachmentAvailable: Swift.Bool) -> Swift.Bool
public static func isValid(passengerInfo: ShareTripSDK.PassengersBookingInformation, isPrimaryPassenger: Swift.Bool, isDomesticFlight: Swift.Bool, isAttachmentAvailable: Swift.Bool) -> Swift.Bool
@objc deinit
}
public struct GenderSelectionCellData : ShareTripSDK.ConfigurableTableViewCellData {
public let title: Swift.String
public let selectedGender: ShareTripSDK.GenderType
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</data>
<key>Assets.car</key>
<data>
twNq5AYyAtbHOSi2qcUtLmOAZDk=
zujkX1/xZ6RlJfbDCePIxLa1A+0=
</data>
<key>BaggageInfoTVCell.nib</key>
<data>
Expand Down Expand Up @@ -394,7 +394,7 @@
</data>
<key>Headers/ShareTripSDK-Swift.h</key>
<data>
zSMaPySAcVOhhJiBxVWrvXQ0JsA=
WOrVlzHTCNLmucOakdJRAzYa8xg=
</data>
<key>Headers/ShareTripSDK.h</key>
<data>
Expand All @@ -406,7 +406,7 @@
</data>
<key>Info.plist</key>
<data>
Z4zxRwlNwwZs0gEc0Ufwv127/vk=
SY9Z+4ijnKuFKmpPU1ZPRHsAZGM=
</data>
<key>InfoDetailCell.nib</key>
<data>
Expand Down Expand Up @@ -474,23 +474,23 @@
</data>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.abi.json</key>
<data>
6oukPrqdF6lDyhnxfbQgZSxzIYg=
F7kuMJSijlxkxVpBuuojLpXv9qQ=
</data>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>
<data>
b9Nv7JLSnHH0VryHJw2JRdpH5fs=
/i1Dpeh1qT2ab9dPn33booGVxQw=
</data>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.swiftdoc</key>
<data>
7Cb4lmnTzw0Ox2Ln5wY1wFuakJA=
BpSZKnDFW2Z6XuZwAXEl3LbguwU=
</data>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.swiftinterface</key>
<data>
b9Nv7JLSnHH0VryHJw2JRdpH5fs=
/i1Dpeh1qT2ab9dPn33booGVxQw=
</data>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.swiftmodule</key>
<data>
PAvOiTV8RXbNq03UBe9mWZkQFrE=
8VXFZfpHHYbEpXz+sACQOpF+IZI=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down Expand Up @@ -720,7 +720,7 @@
<dict>
<key>hash2</key>
<data>
QJYVsQ1DCqb/o+/qwk1Rlnm5mjfDHjwfQz8MARDzcrA=
9qGUY2IJY+86twSfInfHA7bFRQd8WIwztjggezw0NmQ=
</data>
</dict>
<key>BaggageInfoTVCell.nib</key>
Expand Down Expand Up @@ -1378,7 +1378,7 @@
<dict>
<key>hash2</key>
<data>
NJ1ROS55J/gbMbN07uSDDC1tzrmglagpLAAT5OQpN5k=
L3oFoanU4XRRd1NSofIuKPcEE3Pd8y7RXpqQos36DWY=
</data>
</dict>
<key>Headers/ShareTripSDK.h</key>
Expand Down Expand Up @@ -1511,35 +1511,35 @@
<dict>
<key>hash2</key>
<data>
yrBBUEmjXjvF0wJ28fqj2pFjRypryiBkANuH0DDnUdA=
nJXozAWfLvpoiODwdBROEBujHa64tXZMmkDDyor6kNg=
</data>
</dict>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>
<dict>
<key>hash2</key>
<data>
o3fz5UqeYjOajwuU4wBskxnlZzN8635qhJQwVFub7cY=
9ksNA8Ifky/wpc3q1FMTqcpRzP25W60o+v8uSYTu25E=
</data>
</dict>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.swiftdoc</key>
<dict>
<key>hash2</key>
<data>
gREdHWy6Im0AaGOZeJrdEFZt9Ie7jfEGRJIV34EwDh0=
Orp3nZvvdn4+r6c0Nrir6radeS0wDK+u/PdZPN252A4=
</data>
</dict>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.swiftinterface</key>
<dict>
<key>hash2</key>
<data>
o3fz5UqeYjOajwuU4wBskxnlZzN8635qhJQwVFub7cY=
9ksNA8Ifky/wpc3q1FMTqcpRzP25W60o+v8uSYTu25E=
</data>
</dict>
<key>Modules/ShareTripSDK.swiftmodule/arm64-apple-ios.swiftmodule</key>
<dict>
<key>hash2</key>
<data>
T90veqoqPZo9bvc4Qx2pWaDa9BYmcrfV956clns3sm8=
b2+zcCJyl7CFCEj4WrNHBeye42j4L30n041sdUEZDYU=
</data>
</dict>
<key>Modules/module.modulemap</key>
Expand Down
Binary file not shown.
Loading

0 comments on commit ab9a040

Please sign in to comment.