Skip to content

Staging 3.1 #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ah1053 wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Staging 3.1 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36e5e4a
Update qa url and test locations (#110)
Jan 18, 2022
570299f
EDGECLOUD-4106 IDFV (#112)
ah1053 Feb 17, 2022
8a3b83a
Update proto grpc (#113)
ah1053 Feb 17, 2022
d757dae
EDGECLOUD-6060 (#114)
ah1053 Feb 23, 2022
4e9e653
Staging 3.1b (#115)
lgarner Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IOSMatchingEngineSDK/Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 30b5a2349735a96f0d4036e37eda494101dcd85b

COCOAPODS: 1.10.0
COCOAPODS: 1.11.2
4 changes: 2 additions & 2 deletions ...chingEngineSDK/MobiledgeXiOSLibrary/Classes/MatchingEngineState/MatchingEngineState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ extension MobiledgeXiOSLibrary {
// App specific UUID
var uuid: String {
get {
let uuid = ASIdentifierManager.shared().advertisingIdentifier
return uuid.uuidString.utf8.description
let uuid = device.identifierForVendor
return uuid?.uuidString.utf8.description ?? "iosUniqueId"
}
}

Expand Down
18 changes: 14 additions & 4 deletions IOSMatchingEngineSDKGrpc/ExampleGrpc/MatchingEngine.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,10 +575,12 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = BJTX9P49P6;
LastSwiftMigration = 0900;
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = BJTX9P49P6;
LastSwiftMigration = 1120;
TestTargetID = 607FACCF1AFB9204008FA782;
};
Expand Down Expand Up @@ -741,16 +743,20 @@
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIO/NIO.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOConcurrencyHelpers/NIOConcurrencyHelpers.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOCore/NIOCore.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOEmbedded/NIOEmbedded.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOExtras/NIOExtras.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOFoundationCompat/NIOFoundationCompat.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOHPACK/NIOHPACK.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOHTTP1/NIOHTTP1.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOHTTP2/NIOHTTP2.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOPosix/NIOPosix.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOSSL/NIOSSL.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOTLS/NIOTLS.framework",
"${BUILT_PRODUCTS_DIR}/SwiftNIOTransportServices/NIOTransportServices.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
"${BUILT_PRODUCTS_DIR}/_NIODataStructures/_NIODataStructures.framework",
"${BUILT_PRODUCTS_DIR}/gRPC-Swift/GRPC.framework",
);
name = "[CP] Embed Pods Frameworks";
Expand Down Expand Up @@ -778,16 +784,20 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIO.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOConcurrencyHelpers.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOCore.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOEmbedded.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOExtras.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOFoundationCompat.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOHPACK.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOHTTP1.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOHTTP2.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOPosix.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOSSL.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOTLS.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NIOTransportServices.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/_NIODataStructures.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRPC.framework",
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -996,7 +1006,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 033D6E20A36A2B3251FB7DA3 /* Pods-MatchingEngine_Example.debug.xcconfig */;
buildSettings = {
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = BJTX9P49P6;
INFOPLIST_FILE = MatchingEngine/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -1012,7 +1022,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E56005713766F4805886E636 /* Pods-MatchingEngine_Example.release.xcconfig */;
buildSettings = {
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = BJTX9P49P6;
INFOPLIST_FILE = MatchingEngine/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -1029,7 +1039,7 @@
baseConfigurationReference = 52089AED26098AB15949A569 /* Pods-MatchingEngine_Tests.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = BJTX9P49P6;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -1055,7 +1065,7 @@
baseConfigurationReference = FB71EF3F51E6B9780099D19E /* Pods-MatchingEngine_Tests.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = BJTX9P49P6;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand Down
21 changes: 9 additions & 12 deletions IOSMatchingEngineSDKGrpc/ExampleGrpc/MatchingEngine/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ViewController: UIViewController, GMSMapViewDelegate, UIAdaptivePresentati

var host = ""
var port: UInt16 = 50051
var demoHost = "eu-qa.dme.mobiledgex.net"
var demoHost = "us-qa.dme.mobiledgex.net"
//var demoHost = "wifi.dme.mobiledgex.net"

var demo = true; // If true, use DEMO values as opposed to discoverable properties.
Expand All @@ -50,7 +50,6 @@ class ViewController: UIViewController, GMSMapViewDelegate, UIAdaptivePresentati
var authToken: String? = nil
var uniqueID: String?
var uniqueIDType: DistributedMatchEngine_IDTypes?
var cellID: UInt32?
var tags: [String: String]?

var locs: [DistributedMatchEngine_Loc] = []
Expand All @@ -76,16 +75,16 @@ class ViewController: UIViewController, GMSMapViewDelegate, UIAdaptivePresentati
let appDelegate = UIApplication.shared.delegate as! AppDelegate
matchingEngine = appDelegate.matchingEngine

var hawkins = DistributedMatchEngine_Loc.init()
hawkins.latitude = 53.55
hawkins.longitude = 10
var buckhorn = DistributedMatchEngine_Loc.init()
buckhorn.latitude = 50.73438
buckhorn.longitude = 7.09549

var fairview = DistributedMatchEngine_Loc.init()
fairview.latitude = 50.110922
fairview.longitude = 8.682127
var packet = DistributedMatchEngine_Loc.init()
packet.latitude = 33.103
packet.longitude = -96.9655

locs.append(hawkins)
locs.append(fairview)
locs.append(buckhorn)
locs.append(packet)

if demo
{
Expand All @@ -102,7 +101,6 @@ class ViewController: UIViewController, GMSMapViewDelegate, UIAdaptivePresentati
authToken = nil
uniqueID = nil
uniqueIDType = nil
cellID = nil
tags = nil
}
else
Expand All @@ -117,7 +115,6 @@ class ViewController: UIViewController, GMSMapViewDelegate, UIAdaptivePresentati
authToken = nil // opaque developer specific String? value.
uniqueID = nil
uniqueIDType = nil
cellID = nil
tags = nil
}
}
Expand Down
Loading