From ae0c1573fdb52f8227f78a2b399f50b03e5e0ed8 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sat, 13 Dec 2025 01:33:30 +0000 Subject: [PATCH] refactor(swift): rename ClawdisNodeKit to ClawdisKit --- apps/ios/README.md | 2 +- apps/ios/Sources/Bridge/BridgeClient.swift | 2 +- apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift | 2 +- apps/ios/Sources/Bridge/BridgeSession.swift | 2 +- apps/ios/Sources/Model/NodeAppModel.swift | 2 +- apps/ios/Sources/Screen/ScreenController.swift | 2 +- apps/ios/Sources/Screen/ScreenTab.swift | 2 +- apps/ios/Sources/Screen/ScreenWebView.swift | 2 +- apps/ios/project.yml | 8 ++++---- apps/macos/Package.swift | 4 ++-- .../Sources/Clawdis/Bridge/BridgeConnectionHandler.swift | 2 +- apps/macos/Sources/Clawdis/Bridge/BridgeServer.swift | 2 +- apps/macos/Sources/Clawdis/DeepLinks.swift | 2 +- apps/shared/{ClawdisNodeKit => ClawdisKit}/Package.swift | 7 +++---- .../Sources/ClawdisKit}/BonjourTypes.swift | 0 .../Sources/ClawdisKit}/BridgeFrames.swift | 0 .../Sources/ClawdisKit}/DeepLinks.swift | 0 .../Sources/ClawdisKit}/NodeError.swift | 0 .../Sources/ClawdisKit}/ScreenCommands.swift | 0 .../Sources/ClawdisKit}/StoragePaths.swift | 0 20 files changed, 20 insertions(+), 21 deletions(-) rename apps/shared/{ClawdisNodeKit => ClawdisKit}/Package.swift (71%) rename apps/shared/{ClawdisNodeKit/Sources/ClawdisNodeKit => ClawdisKit/Sources/ClawdisKit}/BonjourTypes.swift (100%) rename apps/shared/{ClawdisNodeKit/Sources/ClawdisNodeKit => ClawdisKit/Sources/ClawdisKit}/BridgeFrames.swift (100%) rename apps/shared/{ClawdisNodeKit/Sources/ClawdisNodeKit => ClawdisKit/Sources/ClawdisKit}/DeepLinks.swift (100%) rename apps/shared/{ClawdisNodeKit/Sources/ClawdisNodeKit => ClawdisKit/Sources/ClawdisKit}/NodeError.swift (100%) rename apps/shared/{ClawdisNodeKit/Sources/ClawdisNodeKit => ClawdisKit/Sources/ClawdisKit}/ScreenCommands.swift (100%) rename apps/shared/{ClawdisNodeKit/Sources/ClawdisNodeKit => ClawdisKit/Sources/ClawdisKit}/StoragePaths.swift (100%) diff --git a/apps/ios/README.md b/apps/ios/README.md index 466e35f48..cc7f5cba2 100644 --- a/apps/ios/README.md +++ b/apps/ios/README.md @@ -15,4 +15,4 @@ open ClawdisNode.xcodeproj ``` ## Shared packages -- `../shared/ClawdisNodeKit` — shared types/constants used by iOS (and later macOS bridge + gateway routing). +- `../shared/ClawdisKit` — shared types/constants used by iOS (and later macOS bridge + gateway routing). diff --git a/apps/ios/Sources/Bridge/BridgeClient.swift b/apps/ios/Sources/Bridge/BridgeClient.swift index 9e003bdb0..23ff59726 100644 --- a/apps/ios/Sources/Bridge/BridgeClient.swift +++ b/apps/ios/Sources/Bridge/BridgeClient.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import Foundation import Network diff --git a/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift b/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift index 73a2f1646..970146bdf 100644 --- a/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift +++ b/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import Foundation import Network diff --git a/apps/ios/Sources/Bridge/BridgeSession.swift b/apps/ios/Sources/Bridge/BridgeSession.swift index 38ac1581d..126c0bc1d 100644 --- a/apps/ios/Sources/Bridge/BridgeSession.swift +++ b/apps/ios/Sources/Bridge/BridgeSession.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import Foundation import Network diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift index 8e284232e..4ac89c51d 100644 --- a/apps/ios/Sources/Model/NodeAppModel.swift +++ b/apps/ios/Sources/Model/NodeAppModel.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import Network import SwiftUI diff --git a/apps/ios/Sources/Screen/ScreenController.swift b/apps/ios/Sources/Screen/ScreenController.swift index 0dfc043c7..0d8af18a1 100644 --- a/apps/ios/Sources/Screen/ScreenController.swift +++ b/apps/ios/Sources/Screen/ScreenController.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import SwiftUI import WebKit diff --git a/apps/ios/Sources/Screen/ScreenTab.swift b/apps/ios/Sources/Screen/ScreenTab.swift index 5cdc81bdf..893450525 100644 --- a/apps/ios/Sources/Screen/ScreenTab.swift +++ b/apps/ios/Sources/Screen/ScreenTab.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import SwiftUI struct ScreenTab: View { diff --git a/apps/ios/Sources/Screen/ScreenWebView.swift b/apps/ios/Sources/Screen/ScreenWebView.swift index 4b4762ce5..7d141d57a 100644 --- a/apps/ios/Sources/Screen/ScreenWebView.swift +++ b/apps/ios/Sources/Screen/ScreenWebView.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import SwiftUI import WebKit diff --git a/apps/ios/project.yml b/apps/ios/project.yml index f0f946f0c..399b5a9d8 100644 --- a/apps/ios/project.yml +++ b/apps/ios/project.yml @@ -6,8 +6,8 @@ options: xcodeVersion: "16.0" packages: - ClawdisNodeKit: - path: ../shared/ClawdisNodeKit + ClawdisKit: + path: ../shared/ClawdisKit targets: ClawdisNode: @@ -16,7 +16,7 @@ targets: sources: - path: Sources dependencies: - - package: ClawdisNodeKit + - package: ClawdisKit preBuildScripts: - name: SwiftFormat (lint) script: | @@ -27,7 +27,7 @@ targets: fi swiftformat --lint --config "$SRCROOT/../../.swiftformat" \ "$SRCROOT/Sources" \ - "$SRCROOT/../shared/ClawdisNodeKit/Sources" + "$SRCROOT/../shared/ClawdisKit/Sources" - name: SwiftLint script: | set -euo pipefail diff --git a/apps/macos/Package.swift b/apps/macos/Package.swift index 9a83fa0d8..997948874 100644 --- a/apps/macos/Package.swift +++ b/apps/macos/Package.swift @@ -17,7 +17,7 @@ let package = Package( .package(url: "https://github.com/orchetect/MenuBarExtraAccess", exact: "1.2.2"), .package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.1.0"), .package(url: "https://github.com/sparkle-project/Sparkle", from: "2.8.1"), - .package(path: "../shared/ClawdisNodeKit"), + .package(path: "../shared/ClawdisKit"), ], targets: [ .target( @@ -38,7 +38,7 @@ let package = Package( dependencies: [ "ClawdisIPC", "ClawdisProtocol", - .product(name: "ClawdisNodeKit", package: "ClawdisNodeKit"), + .product(name: "ClawdisKit", package: "ClawdisKit"), .product(name: "MenuBarExtraAccess", package: "MenuBarExtraAccess"), .product(name: "Subprocess", package: "swift-subprocess"), .product(name: "Sparkle", package: "Sparkle"), diff --git a/apps/macos/Sources/Clawdis/Bridge/BridgeConnectionHandler.swift b/apps/macos/Sources/Clawdis/Bridge/BridgeConnectionHandler.swift index bbe2b8700..4aaa18c4c 100644 --- a/apps/macos/Sources/Clawdis/Bridge/BridgeConnectionHandler.swift +++ b/apps/macos/Sources/Clawdis/Bridge/BridgeConnectionHandler.swift @@ -1,4 +1,4 @@ -import ClawdisNodeKit +import ClawdisKit import Foundation import Network import OSLog diff --git a/apps/macos/Sources/Clawdis/Bridge/BridgeServer.swift b/apps/macos/Sources/Clawdis/Bridge/BridgeServer.swift index 09ab1188f..618e8909f 100644 --- a/apps/macos/Sources/Clawdis/Bridge/BridgeServer.swift +++ b/apps/macos/Sources/Clawdis/Bridge/BridgeServer.swift @@ -1,5 +1,5 @@ import AppKit -import ClawdisNodeKit +import ClawdisKit import Foundation import Network import OSLog diff --git a/apps/macos/Sources/Clawdis/DeepLinks.swift b/apps/macos/Sources/Clawdis/DeepLinks.swift index 1ff164622..71b3b27f4 100644 --- a/apps/macos/Sources/Clawdis/DeepLinks.swift +++ b/apps/macos/Sources/Clawdis/DeepLinks.swift @@ -1,5 +1,5 @@ import AppKit -import ClawdisNodeKit +import ClawdisKit import Foundation import OSLog import Security diff --git a/apps/shared/ClawdisNodeKit/Package.swift b/apps/shared/ClawdisKit/Package.swift similarity index 71% rename from apps/shared/ClawdisNodeKit/Package.swift rename to apps/shared/ClawdisKit/Package.swift index 398838062..9f207dc63 100644 --- a/apps/shared/ClawdisNodeKit/Package.swift +++ b/apps/shared/ClawdisKit/Package.swift @@ -3,20 +3,19 @@ import PackageDescription let package = Package( - name: "ClawdisNodeKit", + name: "ClawdisKit", platforms: [ .iOS(.v17), .macOS(.v15), ], products: [ - .library(name: "ClawdisNodeKit", targets: ["ClawdisNodeKit"]), + .library(name: "ClawdisKit", targets: ["ClawdisKit"]), ], targets: [ .target( - name: "ClawdisNodeKit", + name: "ClawdisKit", dependencies: [], swiftSettings: [ .enableUpcomingFeature("StrictConcurrency"), ]), ]) - diff --git a/apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/BonjourTypes.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/BonjourTypes.swift similarity index 100% rename from apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/BonjourTypes.swift rename to apps/shared/ClawdisKit/Sources/ClawdisKit/BonjourTypes.swift diff --git a/apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/BridgeFrames.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/BridgeFrames.swift similarity index 100% rename from apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/BridgeFrames.swift rename to apps/shared/ClawdisKit/Sources/ClawdisKit/BridgeFrames.swift diff --git a/apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/DeepLinks.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/DeepLinks.swift similarity index 100% rename from apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/DeepLinks.swift rename to apps/shared/ClawdisKit/Sources/ClawdisKit/DeepLinks.swift diff --git a/apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/NodeError.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/NodeError.swift similarity index 100% rename from apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/NodeError.swift rename to apps/shared/ClawdisKit/Sources/ClawdisKit/NodeError.swift diff --git a/apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/ScreenCommands.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/ScreenCommands.swift similarity index 100% rename from apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/ScreenCommands.swift rename to apps/shared/ClawdisKit/Sources/ClawdisKit/ScreenCommands.swift diff --git a/apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/StoragePaths.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/StoragePaths.swift similarity index 100% rename from apps/shared/ClawdisNodeKit/Sources/ClawdisNodeKit/StoragePaths.swift rename to apps/shared/ClawdisKit/Sources/ClawdisKit/StoragePaths.swift