making everything explicit to handle various levels of compliance wit…

…h Xcode
automerge · Jul 23, 2024 · 224f76c · 224f76c
1 parent bdf1af4
commit 224f76c
Showing 19 changed files with 42 additions and 46 deletions.
diff --git a/Sources/AutomergeRepo/DocumentId.swift b/Sources/AutomergeRepo/DocumentId.swift
@@ -1,4 +1,4 @@
-import Base58Swift
+internal import Base58Swift
 public import struct Foundation.Data
 public import struct Foundation.UUID
 

diff --git a/Sources/AutomergeRepo/Errors.swift b/Sources/AutomergeRepo/Errors.swift
@@ -1,4 +1,4 @@
-import Foundation
+public import Foundation
 
 /// Describes errors from the repository and providers.
 public enum Errors: Sendable {

diff --git a/Sources/AutomergeRepo/InternalDocHandle.swift b/Sources/AutomergeRepo/InternalDocHandle.swift
@@ -1,7 +1,7 @@
-import struct Automerge.ChangeHash
-import class Automerge.Document
-import struct Automerge.SyncState
-import struct Foundation.Data
+internal import struct Automerge.ChangeHash
+internal import class Automerge.Document
+internal import struct Automerge.SyncState
+internal import struct Foundation.Data
 
 final class InternalDocHandle {
     enum DocHandleState {

diff --git a/Sources/AutomergeRepo/Networking/Backoff.swift b/Sources/AutomergeRepo/Networking/Backoff.swift
@@ -1,4 +1,4 @@
-import Foundation
+internal import Foundation
 
 /// A type that provides a computation for a random back-off value based on an integer number of iterations.
 enum Backoff {

diff --git a/Sources/AutomergeRepo/Networking/NetworkProvider.swift b/Sources/AutomergeRepo/Networking/NetworkProvider.swift
@@ -1,7 +1,4 @@
-// import AsyncAlgorithms
-
-// import protocol Combine.Publisher
-import Automerge
+internal import Automerge
 
 // https://github.com/automerge/automerge-repo/blob/main/packages/automerge-repo/src/network/NetworkAdapterInterface.ts
 

diff --git a/Sources/AutomergeRepo/Networking/NetworkSubsystem.swift b/Sources/AutomergeRepo/Networking/NetworkSubsystem.swift
@@ -1,8 +1,8 @@
 // import AsyncAlgorithms
-import Automerge
-import struct Foundation.Data
-import OSLog
-import PotentCBOR
+internal import Automerge
+internal import struct Foundation.Data
+internal import OSLog
+internal import PotentCBOR
 
 // riff
 // https://github.com/automerge/automerge-repo/blob/main/packages/automerge-repo/src/network/NetworkSubsystem.ts

diff --git a/Sources/AutomergeRepo/Networking/Providers/NWParameters+peerSyncParameters.swift b/Sources/AutomergeRepo/Networking/Providers/NWParameters+peerSyncParameters.swift
@@ -13,8 +13,8 @@
   - https://developer.apple.com/videos/play/wwdc2020/10110/
   */
 
-import CryptoKit
-import Network
+internal import CryptoKit
+internal import Network
 
 extension NWParameters {
     /// Returns listener and connection network parameters using default TLS for peer to peer connections.

diff --git a/Sources/AutomergeRepo/Networking/Providers/P2PAutomergeSyncProtocol.swift b/Sources/AutomergeRepo/Networking/Providers/P2PAutomergeSyncProtocol.swift
@@ -19,9 +19,9 @@
  *
  */
 
-import Foundation
-import Network
-import OSLog
+internal import Foundation
+internal import Network
+internal import OSLog
 
 /// The type of sync message for the Automerge network sync protocol.
 enum P2PSyncMessageType: UInt32 {

diff --git a/Sources/AutomergeRepo/Networking/Providers/PeerToPeerConnection.swift b/Sources/AutomergeRepo/Networking/Providers/PeerToPeerConnection.swift
@@ -12,11 +12,11 @@
  - https://developer.apple.com/videos/play/wwdc2020/10110/
  */
 
-import Automerge
-@preconcurrency import Combine
-import Foundation
-import Network
-import OSLog
+internal import Automerge
+@preconcurrency internal import Combine
+internal import Foundation
+internal import Network
+internal import OSLog
 
 /// A peer-to-peer connection to receive and send sync messages.
 ///

diff --git a/Sources/AutomergeRepo/Networking/Providers/PeerToPeerProvider.swift b/Sources/AutomergeRepo/Networking/Providers/PeerToPeerProvider.swift
@@ -1,8 +1,8 @@
-import AsyncAlgorithms
+internal import AsyncAlgorithms
 @preconcurrency public import Combine
-import Foundation
+internal import Foundation
 public import Network
-import OSLog
+internal import OSLog
 
 /// An Automerge-repo network provider that connects to other instances over a peer to peer network.
 ///

diff --git a/Sources/AutomergeRepo/Networking/Providers/PeerToPeerProviderConfiguration.swift b/Sources/AutomergeRepo/Networking/Providers/PeerToPeerProviderConfiguration.swift
@@ -1,7 +1,7 @@
 public import Automerge
-import Foundation
+internal import Foundation
 #if os(iOS) || os(visionOS)
-import UIKit // for UIDevice.name access
+internal import UIKit // for UIDevice.name access
 #endif
 
 /// A type that represents a configuration for a Peer to Peer Network Provider

diff --git a/Sources/AutomergeRepo/Networking/Providers/WebSocketProvider.swift b/Sources/AutomergeRepo/Networking/Providers/WebSocketProvider.swift
@@ -1,8 +1,8 @@
-import Automerge
+internal import Automerge
 public import Combine
 public import Foundation
-import Network
-import OSLog
+internal import Network
+internal import OSLog
 
 /// An Automerge-repo network provider that connects to other repositories using WebSocket.
 @AutomergeRepo

diff --git a/Sources/AutomergeRepo/PeerMetadata.swift b/Sources/AutomergeRepo/PeerMetadata.swift
@@ -1,4 +1,4 @@
-import Foundation
+internal import Foundation
 
 // ; Metadata sent in either the join or peer message types
 // peer_metadata = {

diff --git a/Sources/AutomergeRepo/Repo+LogComponent.swift b/Sources/AutomergeRepo/Repo+LogComponent.swift
@@ -1,5 +1,5 @@
-import Automerge
-import OSLog
+internal import Automerge
+internal import OSLog
 
 public extension Repo {
     /// Represents the primary internal components of a repository

diff --git a/Sources/AutomergeRepo/Repo.swift b/Sources/AutomergeRepo/Repo.swift
@@ -1,8 +1,8 @@
 public import Automerge
-import AutomergeUtilities
-@preconcurrency import Combine
+internal import AutomergeUtilities
+@preconcurrency internal import Combine
 public import Foundation
-import OSLog
+internal import OSLog
 
 /// A repository for Automerge documents that coordinates storage and synchronization.
 @AutomergeRepo

diff --git a/Sources/AutomergeRepo/Storage/DocumentStorage.swift b/Sources/AutomergeRepo/Storage/DocumentStorage.swift
@@ -1,6 +1,6 @@
-import Automerge
-import Combine
-import Foundation
+internal import Automerge
+internal import Combine
+internal import Foundation
 
 // inspired from automerge-repo:
 // https://github.com/automerge/automerge-repo/blob/main/packages/automerge-repo/src/storage/StorageSubsystem.ts

diff --git a/Sources/AutomergeRepo/Sync/CBORCoder.swift b/Sources/AutomergeRepo/Sync/CBORCoder.swift
@@ -1,4 +1,3 @@
-import Foundation
 public import PotentCBOR
 
 /// A type that provides concurrency-safe access to a CBOR encoder and decoder.

diff --git a/Sources/AutomergeRepo/Sync/SyncV1Msg+encode+decode.swift b/Sources/AutomergeRepo/Sync/SyncV1Msg+encode+decode.swift
@@ -1,6 +1,6 @@
 public import Foundation // Data
-import OSLog
-import PotentCBOR
+internal import OSLog
+internal import PotentCBOR
 
 public extension SyncV1Msg {
     /// Attempts to decode the data you provide as a peer message.

diff --git a/Sources/AutomergeRepo/Sync/SyncV1Msg.swift b/Sources/AutomergeRepo/Sync/SyncV1Msg.swift
@@ -6,7 +6,7 @@
 //
 
 public import Foundation
-import PotentCBOR
+internal import PotentCBOR
 
 // Automerge Repo WebSocket sync details:
 // https://github.com/automerge/automerge-repo/blob/main/packages/automerge-repo-network-websocket/README.md