From 0e2ab5c57c8926da94f1956e3f4bcd80c4bec1da Mon Sep 17 00:00:00 2001 From: Brian Plattenburg <5767019+bplattenburg@users.noreply.github.com> Date: Fri, 10 Jan 2025 16:23:50 -0500 Subject: [PATCH 1/2] Demo extracted presence viewer in a consuming app --- iOS/DittoPOS.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 23 +++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/iOS/DittoPOS.xcodeproj/project.pbxproj b/iOS/DittoPOS.xcodeproj/project.pbxproj index e9379e7..7a2c399 100644 --- a/iOS/DittoPOS.xcodeproj/project.pbxproj +++ b/iOS/DittoPOS.xcodeproj/project.pbxproj @@ -639,8 +639,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/getditto/DittoSwiftTools"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 6.0.0; + branch = BP/extract_presence_viewer; + kind = branch; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f6e18bd..7e4a645 100644 --- a/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,22 +1,31 @@ { "originHash" : "813f35598a8fa9c931a22f18a3f20117f2e42931ac2373c546c2e0f4df7e2d65", "pins" : [ + { + "identity" : "dittopresenceviewercore", + "kind" : "remoteSourceControl", + "location" : "https://github.com/getditto/DittoPresenceViewerCore.git", + "state" : { + "branch" : "BP/box", + "revision" : "3a1de47707b2e5a557c7f9b543634a1b4dbba957" + } + }, { "identity" : "dittoswiftpackage", "kind" : "remoteSourceControl", "location" : "https://github.com/getditto/DittoSwiftPackage", "state" : { - "revision" : "be46e1e83a65a456bcecc8e9e3e8a76611f70e20", - "version" : "4.8.1" + "revision" : "f5fe2be65db126bd0535f3f5e831e679b7aa2dad", + "version" : "4.9.2" } }, { "identity" : "dittoswifttools", "kind" : "remoteSourceControl", - "location" : "https://github.com/getditto/DittoSwiftTools.git", + "location" : "https://github.com/getditto/DittoSwiftTools", "state" : { - "revision" : "756a3bf761da352646851f7d45481dc4a790d0d2", - "version" : "6.0.0" + "branch" : "BP/extract_presence_viewer", + "revision" : "8db95c20e861578b5aa666747b9df0f4ede788fe" } }, { @@ -24,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections", "state" : { - "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06", - "version" : "1.1.3" + "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7", + "version" : "1.1.4" } } ], From 3562ae0e23a01e3f774439a5715bcac7df7e5590 Mon Sep 17 00:00:00 2001 From: Brian Plattenburg <5767019+bplattenburg@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:51:39 -0500 Subject: [PATCH 2/2] Use published versions --- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7e4a645..03ac297 100644 --- a/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getditto/DittoPresenceViewerCore.git", "state" : { - "branch" : "BP/box", - "revision" : "3a1de47707b2e5a557c7f9b543634a1b4dbba957" + "revision" : "d7e8f40814e189e2b9a136390b47178ea8db320b", + "version" : "2.0.0" } }, { @@ -25,7 +25,7 @@ "location" : "https://github.com/getditto/DittoSwiftTools", "state" : { "branch" : "BP/extract_presence_viewer", - "revision" : "8db95c20e861578b5aa666747b9df0f4ede788fe" + "revision" : "0553aa15922025a194815d9cc58d9af92db9db11" } }, {