From 32884e0047797220bef8ef11f5f4bbf26bca0aff Mon Sep 17 00:00:00 2001 From: George Lyon Date: Tue, 12 Aug 2025 11:29:03 -0700 Subject: [PATCH 1/4] Rename Claude to ClaudeAPI --- .../SwiftClaudeAppPackage/Sources/App/Claude Provider.swift | 2 +- .xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift | 4 ++-- .../Sources/Haiku Generator/Haiku Generator.swift | 2 +- Package.swift | 6 +++--- Sources/{Claude => Claude API}/Beta.swift | 0 Sources/{Claude => Claude API}/Cache Breakpoint.swift | 0 Sources/{Claude => Claude API}/Claude.swift | 0 .../Conversation/Assistant Message.swift | 0 .../{Claude => Claude API}/Conversation/Conversation.swift | 0 .../Conversation/Tool Use Block.swift | 0 .../{Claude => Claude API}/Conversation/User Message.swift | 0 Sources/{Claude => Claude API}/Image.swift | 0 Sources/{Claude => Claude API}/Message Content.swift | 0 .../{Claude => Claude API}/Support/Observable (Async).swift | 0 .../Support/Opaque Async Sequence.swift | 0 Sources/{Claude => Claude API}/System Prompt.swift | 0 Sources/{Claude => Claude API}/Tool Use.swift | 0 Sources/{Claude => Claude API}/Tools.swift | 0 18 files changed, 7 insertions(+), 7 deletions(-) rename Sources/{Claude => Claude API}/Beta.swift (100%) rename Sources/{Claude => Claude API}/Cache Breakpoint.swift (100%) rename Sources/{Claude => Claude API}/Claude.swift (100%) rename Sources/{Claude => Claude API}/Conversation/Assistant Message.swift (100%) rename Sources/{Claude => Claude API}/Conversation/Conversation.swift (100%) rename Sources/{Claude => Claude API}/Conversation/Tool Use Block.swift (100%) rename Sources/{Claude => Claude API}/Conversation/User Message.swift (100%) rename Sources/{Claude => Claude API}/Image.swift (100%) rename Sources/{Claude => Claude API}/Message Content.swift (100%) rename Sources/{Claude => Claude API}/Support/Observable (Async).swift (100%) rename Sources/{Claude => Claude API}/Support/Opaque Async Sequence.swift (100%) rename Sources/{Claude => Claude API}/System Prompt.swift (100%) rename Sources/{Claude => Claude API}/Tool Use.swift (100%) rename Sources/{Claude => Claude API}/Tools.swift (100%) diff --git a/.xcode/SwiftClaudeAppPackage/Sources/App/Claude Provider.swift b/.xcode/SwiftClaudeAppPackage/Sources/App/Claude Provider.swift index 87e49849..998a0ac1 100644 --- a/.xcode/SwiftClaudeAppPackage/Sources/App/Claude Provider.swift +++ b/.xcode/SwiftClaudeAppPackage/Sources/App/Claude Provider.swift @@ -1,4 +1,4 @@ -import Claude +import ClaudeAPI import SwiftUI public struct ClaudeProvider: View { diff --git a/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift b/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift index 722b8cc0..e75e703d 100644 --- a/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift +++ b/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift @@ -1,5 +1,5 @@ -import Claude -import ClaudeClient +import ClaudeAPI +import ClaudeAPIClient import HaikuGenerator import SwiftUI diff --git a/.xcode/SwiftClaudeAppPackage/Sources/Haiku Generator/Haiku Generator.swift b/.xcode/SwiftClaudeAppPackage/Sources/Haiku Generator/Haiku Generator.swift index 74f11330..210a28c3 100644 --- a/.xcode/SwiftClaudeAppPackage/Sources/Haiku Generator/Haiku Generator.swift +++ b/.xcode/SwiftClaudeAppPackage/Sources/Haiku Generator/Haiku Generator.swift @@ -1,4 +1,4 @@ -import Claude +import ClaudeAPI import SwiftUI public struct HaikuGenerator: View { diff --git a/Package.swift b/Package.swift index 09d889ab..84e181af 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( products: [ .library( name: "SwiftClaude", - targets: ["Claude"] + targets: ["ClaudeAPI"] ) ], dependencies: [ @@ -50,7 +50,7 @@ let package = Package( ), .target( - name: "Claude", + name: "ClaudeAPI", dependencies: [ "ClaudeMessagesEndpoint", .target(name: "Tool", condition: .when(platforms: .supportToolInput)), @@ -60,7 +60,7 @@ let package = Package( ), .testTarget( name: "ClaudeTests", - dependencies: ["Claude"], + dependencies: ["ClaudeAPI"], path: "Tests/Claude Tests" ), diff --git a/Sources/Claude/Beta.swift b/Sources/Claude API/Beta.swift similarity index 100% rename from Sources/Claude/Beta.swift rename to Sources/Claude API/Beta.swift diff --git a/Sources/Claude/Cache Breakpoint.swift b/Sources/Claude API/Cache Breakpoint.swift similarity index 100% rename from Sources/Claude/Cache Breakpoint.swift rename to Sources/Claude API/Cache Breakpoint.swift diff --git a/Sources/Claude/Claude.swift b/Sources/Claude API/Claude.swift similarity index 100% rename from Sources/Claude/Claude.swift rename to Sources/Claude API/Claude.swift diff --git a/Sources/Claude/Conversation/Assistant Message.swift b/Sources/Claude API/Conversation/Assistant Message.swift similarity index 100% rename from Sources/Claude/Conversation/Assistant Message.swift rename to Sources/Claude API/Conversation/Assistant Message.swift diff --git a/Sources/Claude/Conversation/Conversation.swift b/Sources/Claude API/Conversation/Conversation.swift similarity index 100% rename from Sources/Claude/Conversation/Conversation.swift rename to Sources/Claude API/Conversation/Conversation.swift diff --git a/Sources/Claude/Conversation/Tool Use Block.swift b/Sources/Claude API/Conversation/Tool Use Block.swift similarity index 100% rename from Sources/Claude/Conversation/Tool Use Block.swift rename to Sources/Claude API/Conversation/Tool Use Block.swift diff --git a/Sources/Claude/Conversation/User Message.swift b/Sources/Claude API/Conversation/User Message.swift similarity index 100% rename from Sources/Claude/Conversation/User Message.swift rename to Sources/Claude API/Conversation/User Message.swift diff --git a/Sources/Claude/Image.swift b/Sources/Claude API/Image.swift similarity index 100% rename from Sources/Claude/Image.swift rename to Sources/Claude API/Image.swift diff --git a/Sources/Claude/Message Content.swift b/Sources/Claude API/Message Content.swift similarity index 100% rename from Sources/Claude/Message Content.swift rename to Sources/Claude API/Message Content.swift diff --git a/Sources/Claude/Support/Observable (Async).swift b/Sources/Claude API/Support/Observable (Async).swift similarity index 100% rename from Sources/Claude/Support/Observable (Async).swift rename to Sources/Claude API/Support/Observable (Async).swift diff --git a/Sources/Claude/Support/Opaque Async Sequence.swift b/Sources/Claude API/Support/Opaque Async Sequence.swift similarity index 100% rename from Sources/Claude/Support/Opaque Async Sequence.swift rename to Sources/Claude API/Support/Opaque Async Sequence.swift diff --git a/Sources/Claude/System Prompt.swift b/Sources/Claude API/System Prompt.swift similarity index 100% rename from Sources/Claude/System Prompt.swift rename to Sources/Claude API/System Prompt.swift diff --git a/Sources/Claude/Tool Use.swift b/Sources/Claude API/Tool Use.swift similarity index 100% rename from Sources/Claude/Tool Use.swift rename to Sources/Claude API/Tool Use.swift diff --git a/Sources/Claude/Tools.swift b/Sources/Claude API/Tools.swift similarity index 100% rename from Sources/Claude/Tools.swift rename to Sources/Claude API/Tools.swift From 44f50b2b8b8808bd7c247e594582dac4b688b20f Mon Sep 17 00:00:00 2001 From: George Lyon Date: Tue, 12 Aug 2025 11:30:44 -0700 Subject: [PATCH 2/4] Tweak --- .xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift b/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift index e75e703d..6b6cc714 100644 --- a/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift +++ b/.xcode/SwiftClaudeAppPackage/Sources/App/Content View.swift @@ -1,5 +1,5 @@ import ClaudeAPI -import ClaudeAPIClient +import ClaudeClient import HaikuGenerator import SwiftUI From c028620d28bfe459c2fc661ee3f2a0266ab1e10c Mon Sep 17 00:00:00 2001 From: George Lyon Date: Tue, 12 Aug 2025 11:37:23 -0700 Subject: [PATCH 3/4] Tweak --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index 84e181af..7182cfc0 100644 --- a/Package.swift +++ b/Package.swift @@ -56,6 +56,7 @@ let package = Package( .target(name: "Tool", condition: .when(platforms: .supportToolInput)), .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"), ], + path: "Sources/Claude API", swiftSettings: .claude ), .testTarget( From 200f34cf45cefbfaa194c70c5b291ac842676371 Mon Sep 17 00:00:00 2001 From: George Lyon Date: Tue, 12 Aug 2025 11:41:28 -0700 Subject: [PATCH 4/4] Tweak --- Tests/Claude Tests/Claude Tests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Claude Tests/Claude Tests.swift b/Tests/Claude Tests/Claude Tests.swift index 3567016f..f2e6d115 100644 --- a/Tests/Claude Tests/Claude Tests.swift +++ b/Tests/Claude Tests/Claude Tests.swift @@ -1,7 +1,7 @@ import Foundation import Testing -@testable import Claude +@testable import ClaudeAPI @Test func userMessageTextConcatenation() throws {