From c23d7563c14ca814a724afba5f02f0a1f2a02d9e Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 14 Jan 2026 14:24:04 -0600 Subject: [PATCH] Signed-off-by: Matt Bruce --- .../SharedPackage}/Package.swift | 0 .../SharedKit/Constants/StorageKeyNames.swift | 0 .../Constants/StorageServiceIdentifiers.swift | 0 .../SharedKit/Models/UserProfile.swift | 0 SecureStorageSample.xcodeproj/project.pbxproj | 43 ++++++++----------- .../xcshareddata/swiftpm/Package.resolved | 15 ------- 6 files changed, 17 insertions(+), 41 deletions(-) rename {SharedPackage => Packages/SharedPackage}/Package.swift (100%) rename {SharedPackage => Packages/SharedPackage}/Sources/SharedKit/Constants/StorageKeyNames.swift (100%) rename {SharedPackage => Packages/SharedPackage}/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift (100%) rename {SharedPackage => Packages/SharedPackage}/Sources/SharedKit/Models/UserProfile.swift (100%) delete mode 100644 SecureStorageSample.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/SharedPackage/Package.swift b/Packages/SharedPackage/Package.swift similarity index 100% rename from SharedPackage/Package.swift rename to Packages/SharedPackage/Package.swift diff --git a/SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift b/Packages/SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift similarity index 100% rename from SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift rename to Packages/SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift diff --git a/SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift b/Packages/SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift similarity index 100% rename from SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift rename to Packages/SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift diff --git a/SharedPackage/Sources/SharedKit/Models/UserProfile.swift b/Packages/SharedPackage/Sources/SharedKit/Models/UserProfile.swift similarity index 100% rename from SharedPackage/Sources/SharedKit/Models/UserProfile.swift rename to Packages/SharedPackage/Sources/SharedKit/Models/UserProfile.swift diff --git a/SecureStorageSample.xcodeproj/project.pbxproj b/SecureStorageSample.xcodeproj/project.pbxproj index 0593be8..8babae3 100644 --- a/SecureStorageSample.xcodeproj/project.pbxproj +++ b/SecureStorageSample.xcodeproj/project.pbxproj @@ -8,11 +8,11 @@ /* Begin PBXBuildFile section */ EA179D562F17379800B1D54A /* LocalData in Frameworks */ = {isa = PBXBuildFile; productRef = EA179D552F17379800B1D54A /* LocalData */; }; - EA238DF52F18308300AC8894 /* LocalData in Frameworks */ = {isa = PBXBuildFile; productRef = EA238DF42F18308300AC8894 /* LocalData */; }; + EA238DF82F18328100AC8894 /* LocalData in Frameworks */ = {isa = PBXBuildFile; productRef = EA238DF72F18328100AC8894 /* LocalData */; }; + EA238DFB2F1832C600AC8894 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA238DFA2F1832C600AC8894 /* SharedKit */; }; EA65D70D2F17DDEB00C48466 /* SecureStorageSample Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = EA65D6E52F17DD6700C48466 /* SecureStorageSample Watch App.app */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; EA65D9442F17EAD800C48466 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA65D7312F17DDEB00C48466 /* SharedKit */; }; EA65D9452F17EAD800C48466 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA65D7312F17DDEB00C48466 /* SharedKit */; }; - EA65D9C12F17F2FA00C48466 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA65D9C02F17F2FA00C48466 /* SharedKit */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -114,9 +114,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + EA238DFB2F1832C600AC8894 /* SharedKit in Frameworks */, EA65D9442F17EAD800C48466 /* SharedKit in Frameworks */, EA179D562F17379800B1D54A /* LocalData in Frameworks */, - EA238DF52F18308300AC8894 /* LocalData in Frameworks */, + EA238DF82F18328100AC8894 /* LocalData in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -139,7 +140,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EA65D9C12F17F2FA00C48466 /* SharedKit in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -218,7 +218,8 @@ packageProductDependencies = ( EA179D552F17379800B1D54A /* LocalData */, EA65D7312F17DDEB00C48466 /* SharedKit */, - EA238DF42F18308300AC8894 /* LocalData */, + EA238DF72F18328100AC8894 /* LocalData */, + EA238DFA2F1832C600AC8894 /* SharedKit */, ); productName = SecureStorageSample; productReference = EA179D012F1722BB00B1D54A /* SecureStorageSample.app */; @@ -288,7 +289,6 @@ ); name = "SecureStorageSample Watch App"; packageProductDependencies = ( - EA65D9C02F17F2FA00C48466 /* SharedKit */, ); productName = "SecureStorageSample Watch App"; productReference = EA65D6E52F17DD6700C48466 /* SecureStorageSample Watch App.app */; @@ -384,8 +384,8 @@ mainGroup = EA179CF82F1722BB00B1D54A; minimizedProjectReferenceProxies = 1; packageReferences = ( - EA65D7302F17DDEB00C48466 /* XCLocalSwiftPackageReference "SharedPackage" */, - EA238DF32F18308300AC8894 /* XCRemoteSwiftPackageReference "LocalData" */, + EA238DF62F18328100AC8894 /* XCLocalSwiftPackageReference "../remotePackages/LocalData" */, + EA238DF92F1832C600AC8894 /* XCLocalSwiftPackageReference "Packages/SharedPackage" */, ); preferredProjectObjectVersion = 77; productRefGroup = EA179D022F1722BB00B1D54A /* Products */; @@ -1013,40 +1013,31 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - EA65D7302F17DDEB00C48466 /* XCLocalSwiftPackageReference "SharedPackage" */ = { + EA238DF62F18328100AC8894 /* XCLocalSwiftPackageReference "../remotePackages/LocalData" */ = { isa = XCLocalSwiftPackageReference; - relativePath = SharedPackage; + relativePath = ../remotePackages/LocalData; + }; + EA238DF92F1832C600AC8894 /* XCLocalSwiftPackageReference "Packages/SharedPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Packages/SharedPackage; }; /* End XCLocalSwiftPackageReference section */ -/* Begin XCRemoteSwiftPackageReference section */ - EA238DF32F18308300AC8894 /* XCRemoteSwiftPackageReference "LocalData" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "http://192.168.1.128:3000/mbrucedogs/LocalData.git"; - requirement = { - branch = develop; - kind = branch; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - /* Begin XCSwiftPackageProductDependency section */ EA179D552F17379800B1D54A /* LocalData */ = { isa = XCSwiftPackageProductDependency; productName = LocalData; }; - EA238DF42F18308300AC8894 /* LocalData */ = { + EA238DF72F18328100AC8894 /* LocalData */ = { isa = XCSwiftPackageProductDependency; - package = EA238DF32F18308300AC8894 /* XCRemoteSwiftPackageReference "LocalData" */; productName = LocalData; }; - EA65D7312F17DDEB00C48466 /* SharedKit */ = { + EA238DFA2F1832C600AC8894 /* SharedKit */ = { isa = XCSwiftPackageProductDependency; productName = SharedKit; }; - EA65D9C02F17F2FA00C48466 /* SharedKit */ = { + EA65D7312F17DDEB00C48466 /* SharedKit */ = { isa = XCSwiftPackageProductDependency; - package = EA65D7302F17DDEB00C48466 /* XCLocalSwiftPackageReference "SharedPackage" */; productName = SharedKit; }; /* End XCSwiftPackageProductDependency section */ diff --git a/SecureStorageSample.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SecureStorageSample.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index e881dd4..0000000 --- a/SecureStorageSample.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,15 +0,0 @@ -{ - "originHash" : "330d9c3f44f855de747c1e289c1b10ce207bc425f315fb85cd0c6d105ad4d36a", - "pins" : [ - { - "identity" : "localdata", - "kind" : "remoteSourceControl", - "location" : "http://192.168.1.128:3000/mbrucedogs/LocalData.git", - "state" : { - "branch" : "develop", - "revision" : "202ed6063b35c30db53d1975c53ddaf63851e7b7" - } - } - ], - "version" : 3 -}