diff --git a/Examples/dp-simulator/dp-simulator.xcodeproj/project.pbxproj b/Examples/dp-simulator/dp-simulator.xcodeproj/project.pbxproj index 6a316e5..60ffe2c 100644 --- a/Examples/dp-simulator/dp-simulator.xcodeproj/project.pbxproj +++ b/Examples/dp-simulator/dp-simulator.xcodeproj/project.pbxproj @@ -107,7 +107,7 @@ mainGroup = AE7DB8672FAD713E00B4CF49; minimizedProjectReferenceProxies = 1; packageReferences = ( - AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../data-sdk" */, + AE7DB8862FAD8A4B00B4CF49 /* XCLocalSwiftPackageReference "../.." */, ); preferredProjectObjectVersion = 77; productRefGroup = AE7DB8712FAD713E00B4CF49 /* Products */; @@ -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 */ diff --git a/Examples/dp-simulator/dp-simulator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/dp-simulator/dp-simulator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 06f03bb..0000000 --- a/Examples/dp-simulator/dp-simulator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,222 +0,0 @@ -{ - "originHash" : "dcceab5a796629740a4c2e6abe30c4a3c6d01bc09516730ba0881239f9c7caa3", - "pins" : [ - { - "identity" : "alibabacloud-oss-swift-sdk-v2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/aliyun/alibabacloud-oss-swift-sdk-v2.git", - "state" : { - "revision" : "f9583dda9ea06e7e592739446e983507497a8094", - "version" : "0.2.0" - } - }, - { - "identity" : "grpc-swift-2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/grpc/grpc-swift-2.git", - "state" : { - "revision" : "d19a94824cc6fa182211e8197ce391ff712b69f1", - "version" : "2.4.0" - } - }, - { - "identity" : "grpc-swift-nio-transport", - "kind" : "remoteSourceControl", - "location" : "https://github.com/grpc/grpc-swift-nio-transport.git", - "state" : { - "revision" : "f62a09000685b5b86ee383b63e042f286b1a5422", - "version" : "2.7.0" - } - }, - { - "identity" : "grpc-swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/grpc/grpc-swift-protobuf.git", - "state" : { - "revision" : "8723cf856dc23d9c2fad4d874e7b9ed3254acf03", - "version" : "2.3.0" - } - }, - { - "identity" : "swift-algorithms", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-algorithms.git", - "state" : { - "revision" : "87e50f483c54e6efd60e885f7f5aa946cee68023", - "version" : "1.2.1" - } - }, - { - "identity" : "swift-asn1", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-asn1.git", - "state" : { - "revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab", - "version" : "1.7.0" - } - }, - { - "identity" : "swift-async-algorithms", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-async-algorithms.git", - "state" : { - "revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272", - "version" : "1.1.3" - } - }, - { - "identity" : "swift-atomics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-atomics.git", - "state" : { - "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7", - "version" : "1.3.0" - } - }, - { - "identity" : "swift-certificates", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-certificates.git", - "state" : { - "revision" : "bde8ca32a096825dfce37467137c903418c1893d", - "version" : "1.19.1" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections.git", - "state" : { - "revision" : "6675bc0ff86e61436e615df6fc5174e043e57924", - "version" : "1.4.1" - } - }, - { - "identity" : "swift-crypto", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-crypto.git", - "state" : { - "revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc", - "version" : "3.15.1" - } - }, - { - "identity" : "swift-http-structured-headers", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-http-structured-headers.git", - "state" : { - "revision" : "933538faa42c432d385f02e07df0ace7c5ecfc47", - "version" : "1.7.0" - } - }, - { - "identity" : "swift-http-types", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-http-types.git", - "state" : { - "revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca", - "version" : "1.5.1" - } - }, - { - "identity" : "swift-log", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-log.git", - "state" : { - "revision" : "5073617dac96330a486245e4c0179cb0a6fd2256", - "version" : "1.12.0" - } - }, - { - "identity" : "swift-nio", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio.git", - "state" : { - "revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237", - "version" : "2.99.0" - } - }, - { - "identity" : "swift-nio-extras", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-extras.git", - "state" : { - "revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6", - "version" : "1.34.0" - } - }, - { - "identity" : "swift-nio-http2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-http2.git", - "state" : { - "revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9", - "version" : "1.43.0" - } - }, - { - "identity" : "swift-nio-ssl", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-ssl.git", - "state" : { - "revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da", - "version" : "2.37.0" - } - }, - { - "identity" : "swift-nio-transport-services", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-transport-services.git", - "state" : { - "revision" : "67787bb645a5e67d2edcdfbe48a216cc549222d5", - "version" : "1.28.0" - } - }, - { - "identity" : "swift-numerics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-numerics.git", - "state" : { - "revision" : "0c0290ff6b24942dadb83a929ffaaa1481df04a2", - "version" : "1.1.1" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "81558271e243f8f47dfe8e9fdd55f3c2b5413f68", - "version" : "1.37.0" - } - }, - { - "identity" : "swift-service-lifecycle", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swift-server/swift-service-lifecycle.git", - "state" : { - "revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a", - "version" : "2.11.0" - } - }, - { - "identity" : "swift-system", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-system.git", - "state" : { - "revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df", - "version" : "1.6.4" - } - }, - { - "identity" : "xmlcoder", - "kind" : "remoteSourceControl", - "location" : "https://github.com/CoreOffice/XMLCoder.git", - "state" : { - "revision" : "b2b5d72345bab9e1938a483cf862b498aeed3796", - "version" : "0.18.1" - } - } - ], - "version" : 3 -} diff --git a/Examples/dp-simulator/dp-simulator.xcodeproj/xcuserdata/pfwang80s.xcuserdatad/xcschemes/xcschememanagement.plist b/Examples/dp-simulator/dp-simulator.xcodeproj/xcuserdata/pfwang80s.xcuserdatad/xcschemes/xcschememanagement.plist index 1ce7656..2f173e7 100644 --- a/Examples/dp-simulator/dp-simulator.xcodeproj/xcuserdata/pfwang80s.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Examples/dp-simulator/dp-simulator.xcodeproj/xcuserdata/pfwang80s.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ dp-simulator.xcscheme_^#shared#^_ orderHint - 1 + 0 diff --git a/Examples/dp-simulator/dp-simulator/GatewayUploadService.swift b/Examples/dp-simulator/dp-simulator/GatewayUploadService.swift index e60a27a..1b54bdf 100644 --- a/Examples/dp-simulator/dp-simulator/GatewayUploadService.swift +++ b/Examples/dp-simulator/dp-simulator/GatewayUploadService.swift @@ -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 diff --git a/Examples/dp-simulator/dp-simulator/UploadDemoViewModel.swift b/Examples/dp-simulator/dp-simulator/UploadDemoViewModel.swift index 2599aa6..9124998 100644 --- a/Examples/dp-simulator/dp-simulator/UploadDemoViewModel.swift +++ b/Examples/dp-simulator/dp-simulator/UploadDemoViewModel.swift @@ -3,7 +3,6 @@ import DataGatewayClient import DGWControlPlane import DGWStore import Foundation -import UIKit @MainActor final class UploadDemoViewModel: ObservableObject { @@ -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 @@ -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 } }