Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Examples/dp-simulator/dp-simulator.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
mainGroup = AE7DB8672FAD713E00B4CF49;
minimizedProjectReferenceProxies = 1;
packageReferences = (
AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../data-sdk" */,
AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../.." */,
);
preferredProjectObjectVersion = 77;
productRefGroup = AE7DB8712FAD713E00B4CF49 /* Products */;
Expand Down Expand Up @@ -347,26 +347,26 @@
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../data-sdk" */ = {
AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../.." */ = {
isa = XCLocalSwiftPackageReference;
relativePath = "../data-sdk";
relativePath = "../..";
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
AE7DB8832FAD8A4B00B4CF49 /* DataGatewayClient */ = {
isa = XCSwiftPackageProductDependency;
package = AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../data-sdk" */;
package = AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../.." */;
productName = DataGatewayClient;
};
AE7DB8842FAD8A4B00B4CF49 /* DGWControlPlane */ = {
isa = XCSwiftPackageProductDependency;
package = AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../data-sdk" */;
package = AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../.." */;
productName = DGWControlPlane;
};
AE7DB8852FAD8A4B00B4CF49 /* DGWStore */ = {
isa = XCSwiftPackageProductDependency;
package = AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../data-sdk" */;
package = AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../.." */;
productName = DGWStore;
};
/* End XCSwiftPackageProductDependency section */
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>dp-simulator.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct GatewayPaths: Sendable {

return GatewayPaths(
archebaseRootURL: archebaseRoot,
endpointsURL: archebaseRoot.appendingPathComponent("archebase-endpoints.json").standardizedFileURL,
endpointsURL: archebaseRoot.appendingPathComponent(ArchebasePublicEndpoints.endpointsFileName).standardizedFileURL,
configURL: archebaseRoot.appendingPathComponent("archebase-config.json").standardizedFileURL,
persistRootURL: archebaseRoot.appendingPathComponent("Uploads", isDirectory: true).standardizedFileURL,
demoFilesURL: archebaseRoot.appendingPathComponent("Demo Files", isDirectory: true).standardizedFileURL
Expand Down
11 changes: 4 additions & 7 deletions Examples/dp-simulator/dp-simulator/UploadDemoViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import DataGatewayClient
import DGWControlPlane
import DGWStore
import Foundation
import UIKit

@MainActor
final class UploadDemoViewModel: ObservableObject {
Expand Down Expand Up @@ -509,9 +508,7 @@ final class UploadDemoViewModel: ObservableObject {
return storedValue
}

let deviceSuffix = UIDevice.current.identifierForVendor?.uuidString.prefix(8).lowercased()
?? UUID().uuidString.prefix(8).lowercased()
return "ios-\(deviceSuffix)"
return ""
}

#if DEBUG
Expand Down Expand Up @@ -563,17 +560,17 @@ final class UploadDemoViewModel: ObservableObject {
{
"auth": {
"scheme": "http",
"host": "nlb-isnnehtfmxqv70lvm9.cn-shanghai.nlb.aliyuncsslb.com",
"host": "nlb-bz7li0ks67z1i7ii00.cn-shanghai.nlb.aliyuncsslb.com",
"port": 50051
},
"gateway": {
"scheme": "http",
"host": "nlb-isnnehtfmxqv70lvm9.cn-shanghai.nlb.aliyuncsslb.com",
"host": "nlb-bz7li0ks67z1i7ii00.cn-shanghai.nlb.aliyuncsslb.com",
"port": 50053
},
"deviceInit": {
"scheme": "http",
"host": "nlb-isnnehtfmxqv70lvm9.cn-shanghai.nlb.aliyuncsslb.com",
"host": "nlb-bz7li0ks67z1i7ii00.cn-shanghai.nlb.aliyuncsslb.com",
"port": 50057
}
}
Expand Down