Skip to content
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

Jump to bottom

Updates MeetingNotes to replace networking internals with library extracted from that code: automerge-repo-swift #42

Merged
merged 21 commits into from
May 8, 2024
Merged

Updates MeetingNotes to replace networking internals with library extracted from that code: automerge-repo-swift #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e66c000
removing legacy code, re-adding WebsocketSyncConnection as a singular…
heckj Apr 11, 2024
5cefbe2
making a global repo
heckj Apr 12, 2024
5f4aa07
rebuilding up views around exposed Repo structs and provider details
heckj Apr 14, 2024
0b19351
removed sync coorindator legacy, full compiling - still need to migra…
heckj Apr 14, 2024
2a137c8
fixing issue receiving publishers generated off main thread
heckj Apr 15, 2024
ae35d7b
cleanup
heckj Apr 15, 2024
544c645
moving userdefault usage into App from library, need to filter self-p…
heckj Apr 15, 2024
0ffe8d6
converting PeerSyncView to peer to peer/repo structures and updating …
heckj Apr 15, 2024
059e72f
latest repo code
heckj Apr 16, 2024
1f9d495
resolving missing sync to disk with repo-induced change to a document
heckj Apr 19, 2024
a431dd3
updating to align with latest API updates
heckj Apr 23, 2024
e32bd1a
curation update for rebuild
heckj Apr 24, 2024
19e85a1
partial updates
heckj Apr 27, 2024
e9cf6a8
finish removing legacy types, all in on repo
heckj Apr 27, 2024
359e102
log cleanup
heckj May 1, 2024
cbb8239
activate tracing
heckj May 4, 2024
2e05796
enable repo tracing
heckj May 4, 2024
cd59173
cleaning up sync issues and tracing
heckj May 6, 2024
e264808
doing some extra tracking of heads to double check change notifications
heckj May 6, 2024
e8c4c1e
sendable, set name properly
heckj May 7, 2024
c805c44
updating to initial automerge-repo-swift release
heckj May 8, 2024
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
51 changes: 27 additions & 24 deletions MeetingNotes.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 60;
objectVersion = 56;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -25,16 +25,17 @@
1A273DD52B93EEF700B321C5 /* Automerge in Frameworks */ = {isa = PBXBuildFile; productRef = 1A273DD42B93EEF700B321C5 /* Automerge */; };
1A273DD72B93F64500B321C5 /* Logger+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A273DD62B93F64500B321C5 /* Logger+extensions.swift */; };
1A2A02A52A50E74B0044064B /* EditableAgendaItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A02A42A50E74A0044064B /* EditableAgendaItemView.swift */; };
1A2AD0312A7437E200EF0C5F /* SyncConnectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A2AD0302A7437E200EF0C5F /* SyncConnectionView.swift */; };
1A2AD0312A7437E200EF0C5F /* PeerConnectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A2AD0302A7437E200EF0C5F /* PeerConnectionView.swift */; };
1A6FF21D2B64710700C99F81 /* WebSocketStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FF21C2B64710700C99F81 /* WebSocketStatusView.swift */; };
1A7700C52A67343800869A4D /* PeerSyncView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A7700C42A67343800869A4D /* PeerSyncView.swift */; };
1A7700C72A67479F00869A4D /* NWBrowserResultItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A7700C62A67479F00869A4D /* NWBrowserResultItemView.swift */; };
1A9D231A2B940D23007F3A16 /* AutomergeRepo in Frameworks */ = {isa = PBXBuildFile; productRef = 1A9D23192B940D23007F3A16 /* AutomergeRepo */; };
1A7700C72A67479F00869A4D /* AvailablePeer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A7700C62A67479F00869A4D /* AvailablePeer.swift */; };
1A90F7F62BC75BEE00E5B3BA /* AutomergeRepo in Frameworks */ = {isa = PBXBuildFile; productRef = 1A90F7F52BC75BEE00E5B3BA /* AutomergeRepo */; };
1AC103972B7EB0EF0099296C /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1AC103962B7EB0EF0099296C /* PrivacyInfo.xcprivacy */; };
1AD5DA352A4650520085DF79 /* MeetingNotesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD5DA342A4650520085DF79 /* MeetingNotesModel.swift */; };
1AD71E8E2A57622B00B965BF /* MeetingNotesDocumentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71E8D2A57622B00B965BF /* MeetingNotesDocumentView.swift */; };
1AD71E912A57630B00B965BF /* MergeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71E902A57630B00B965BF /* MergeView.swift */; };
1AD71E932A5765A800B965BF /* SyncStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71E922A5765A800B965BF /* SyncStatusView.swift */; };
1AEFB5682BCDA2B50096D5DF /* UserDefaultKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AEFB5672BCDA2B50096D5DF /* UserDefaultKeys.swift */; };
1AF4DDDA2B7C57E800B23BF8 /* ExportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4DDD92B7C57E800B23BF8 /* ExportView.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -70,18 +71,18 @@
1A0DDC532A464DEB001ECADD /* MeetingNotesUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingNotesUITests.swift; sourceTree = "<group>"; };
1A0DDC552A464DEB001ECADD /* MeetingNotesUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingNotesUITestsLaunchTests.swift; sourceTree = "<group>"; };
1A0DDC622A464E2D001ECADD /* MeetingNotes.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = MeetingNotes.xctestplan; sourceTree = "<group>"; };
1A273DC02B93EBD000B321C5 /* Packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Packages; sourceTree = "<group>"; };
1A273DD62B93F64500B321C5 /* Logger+extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+extensions.swift"; sourceTree = "<group>"; };
1A2A02A42A50E74A0044064B /* EditableAgendaItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableAgendaItemView.swift; sourceTree = "<group>"; };
1A2AD0302A7437E200EF0C5F /* SyncConnectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncConnectionView.swift; sourceTree = "<group>"; };
1A2AD0302A7437E200EF0C5F /* PeerConnectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerConnectionView.swift; sourceTree = "<group>"; };
1A6FF21C2B64710700C99F81 /* WebSocketStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSocketStatusView.swift; sourceTree = "<group>"; };
1A7700C42A67343800869A4D /* PeerSyncView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerSyncView.swift; sourceTree = "<group>"; };
1A7700C62A67479F00869A4D /* NWBrowserResultItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NWBrowserResultItemView.swift; sourceTree = "<group>"; };
1A7700C62A67479F00869A4D /* AvailablePeer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvailablePeer.swift; sourceTree = "<group>"; };
1AC103962B7EB0EF0099296C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
1AD5DA342A4650520085DF79 /* MeetingNotesModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MeetingNotesModel.swift; sourceTree = "<group>"; };
1AD71E8D2A57622B00B965BF /* MeetingNotesDocumentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingNotesDocumentView.swift; sourceTree = "<group>"; };
1AD71E902A57630B00B965BF /* MergeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeView.swift; sourceTree = "<group>"; };
1AD71E922A5765A800B965BF /* SyncStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncStatusView.swift; sourceTree = "<group>"; };
1AEFB5672BCDA2B50096D5DF /* UserDefaultKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultKeys.swift; sourceTree = "<group>"; };
1AF4DDD92B7C57E800B23BF8 /* ExportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportView.swift; sourceTree = "<group>"; };
1AF5DB3A2A4A0C38008DAC6F /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
1AF5DB3B2A4A0C5E008DAC6F /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
Expand All @@ -92,6 +93,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1A90F7F62BC75BEE00E5B3BA /* AutomergeRepo in Frameworks */,
1A273DCC2B93EEA600B321C5 /* Base58Swift in Frameworks */,
1A273DCF2B93EEBB00B321C5 /* Automerge in Frameworks */,
1A273DC92B93EE9300B321C5 /* PotentCodables in Frameworks */,
Expand All @@ -104,7 +106,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1A9D231A2B940D23007F3A16 /* AutomergeRepo in Frameworks */,
1A273DD32B93EEEC00B321C5 /* Base58Swift in Frameworks */,
1A273DD12B93EEE200B321C5 /* PotentCodables in Frameworks */,
1A273DD52B93EEF700B321C5 /* Automerge in Frameworks */,
Expand All @@ -128,7 +129,6 @@
1AF5DB3A2A4A0C38008DAC6F /* README.md */,
1AF5DB3B2A4A0C5E008DAC6F /* CONTRIBUTING.md */,
1A0DDC622A464E2D001ECADD /* MeetingNotes.xctestplan */,
1A273DC02B93EBD000B321C5 /* Packages */,
1A0DDC332A464DEA001ECADD /* MeetingNotes */,
1A0DDC482A464DEB001ECADD /* MeetingNotesTests */,
1A0DDC522A464DEB001ECADD /* MeetingNotesUITests */,
Expand All @@ -151,6 +151,7 @@
isa = PBXGroup;
children = (
1A0DDC342A464DEA001ECADD /* MeetingNotesApp.swift */,
1AEFB5672BCDA2B50096D5DF /* UserDefaultKeys.swift */,
1AB369012A50D82C00F855F8 /* Views */,
1A0DDC362A464DEA001ECADD /* MeetingNotesDocument.swift */,
1AD5DA342A4650520085DF79 /* MeetingNotesModel.swift */,
Expand Down Expand Up @@ -202,8 +203,8 @@
1AD71E8D2A57622B00B965BF /* MeetingNotesDocumentView.swift */,
1A2A02A42A50E74A0044064B /* EditableAgendaItemView.swift */,
1A7700C42A67343800869A4D /* PeerSyncView.swift */,
1A7700C62A67479F00869A4D /* NWBrowserResultItemView.swift */,
1A2AD0302A7437E200EF0C5F /* SyncConnectionView.swift */,
1A7700C62A67479F00869A4D /* AvailablePeer.swift */,
1A2AD0302A7437E200EF0C5F /* PeerConnectionView.swift */,
1AD71E902A57630B00B965BF /* MergeView.swift */,
1AF4DDD92B7C57E800B23BF8 /* ExportView.swift */,
1AD71E922A5765A800B965BF /* SyncStatusView.swift */,
Expand Down Expand Up @@ -234,6 +235,7 @@
1A273DC82B93EE9300B321C5 /* PotentCodables */,
1A273DCB2B93EEA600B321C5 /* Base58Swift */,
1A273DCE2B93EEBB00B321C5 /* Automerge */,
1A90F7F52BC75BEE00E5B3BA /* AutomergeRepo */,
);
productName = MeetingNotes;
productReference = 1A0DDC312A464DEA001ECADD /* MeetingNotes.app */;
Expand All @@ -257,7 +259,6 @@
1A273DD02B93EEE200B321C5 /* PotentCodables */,
1A273DD22B93EEEC00B321C5 /* Base58Swift */,
1A273DD42B93EEF700B321C5 /* Automerge */,
1A9D23192B940D23007F3A16 /* AutomergeRepo */,
);
productName = MeetingNotesTests;
productReference = 1A0DDC452A464DEB001ECADD /* MeetingNotesTests.xctest */;
Expand Down Expand Up @@ -314,10 +315,10 @@
);
mainGroup = 1A0DDC282A464DEA001ECADD;
packageReferences = (
1A273DC42B93ECF400B321C5 /* XCLocalSwiftPackageReference "Packages/automerge-repo" */,
1A273DC72B93EE9300B321C5 /* XCRemoteSwiftPackageReference "PotentCodables" */,
1A273DCA2B93EEA600B321C5 /* XCRemoteSwiftPackageReference "Base58Swift" */,
1A273DCD2B93EEBA00B321C5 /* XCRemoteSwiftPackageReference "automerge-swift" */,
1A90F7F42BC75BEE00E5B3BA /* XCRemoteSwiftPackageReference "automerge-repo-swift" */,
);
productRefGroup = 1A0DDC322A464DEA001ECADD /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -364,15 +365,16 @@
files = (
1A0DDC372A464DEA001ECADD /* MeetingNotesDocument.swift in Sources */,
1AD5DA352A4650520085DF79 /* MeetingNotesModel.swift in Sources */,
1A2AD0312A7437E200EF0C5F /* SyncConnectionView.swift in Sources */,
1A2AD0312A7437E200EF0C5F /* PeerConnectionView.swift in Sources */,
1A2A02A52A50E74B0044064B /* EditableAgendaItemView.swift in Sources */,
1A0917002A4A171C00D80BF7 /* Documentation.docc in Sources */,
1AEFB5682BCDA2B50096D5DF /* UserDefaultKeys.swift in Sources */,
1AD71E912A57630B00B965BF /* MergeView.swift in Sources */,
1A6FF21D2B64710700C99F81 /* WebSocketStatusView.swift in Sources */,
1A0DDC352A464DEA001ECADD /* MeetingNotesApp.swift in Sources */,
1AD71E8E2A57622B00B965BF /* MeetingNotesDocumentView.swift in Sources */,
1A273DD72B93F64500B321C5 /* Logger+extensions.swift in Sources */,
1A7700C72A67479F00869A4D /* NWBrowserResultItemView.swift in Sources */,
1A7700C72A67479F00869A4D /* AvailablePeer.swift in Sources */,
1AD71E932A5765A800B965BF /* SyncStatusView.swift in Sources */,
1A7700C52A67343800869A4D /* PeerSyncView.swift in Sources */,
1AF4DDDA2B7C57E800B23BF8 /* ExportView.swift in Sources */,
Expand Down Expand Up @@ -768,13 +770,6 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
1A273DC42B93ECF400B321C5 /* XCLocalSwiftPackageReference "Packages/automerge-repo" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = "Packages/automerge-repo";
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
1A273DC72B93EE9300B321C5 /* XCRemoteSwiftPackageReference "PotentCodables" */ = {
isa = XCRemoteSwiftPackageReference;
Expand All @@ -800,6 +795,14 @@
minimumVersion = 0.5.8;
};
};
1A90F7F42BC75BEE00E5B3BA /* XCRemoteSwiftPackageReference "automerge-repo-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/automerge/automerge-repo-swift";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.1.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -841,9 +844,9 @@
package = 1A273DCD2B93EEBA00B321C5 /* XCRemoteSwiftPackageReference "automerge-swift" */;
productName = Automerge;
};
1A9D23192B940D23007F3A16 /* AutomergeRepo */ = {
1A90F7F52BC75BEE00E5B3BA /* AutomergeRepo */ = {
isa = XCSwiftPackageProductDependency;
package = 1A273DC42B93ECF400B321C5 /* XCLocalSwiftPackageReference "Packages/automerge-repo" */;
package = 1A90F7F42BC75BEE00E5B3BA /* XCRemoteSwiftPackageReference "automerge-repo-swift" */;
productName = AutomergeRepo;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
15 changes: 14 additions & 1 deletion MeetingNotes.xcodeproj/xcshareddata/xcschemes/MeetingNotes.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<TestPlans>
<TestPlanReference
reference = "container:MeetingNotes.xctestplan">
reference = "container:MeetingNotes.xctestplan"
default = "YES">
</TestPlanReference>
</TestPlans>
<Testables>
Expand Down Expand Up @@ -78,6 +79,18 @@
ReferencedContainer = "container:MeetingNotes.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "IDEPreferLogStreaming"
value = "YES"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "CFNETWORK_DIAGNOSTICS"
value = "3"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading