Skip to content

Revert "Create new target for common code (#1331)" #1352

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −44
Open

Revert "Create new target for common code (#1331)" #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 0 additions & 24 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ let package = Package(
.target(
name: "SwiftDocC",
dependencies: [
.target(name: "DocCCommon"),
.product(name: "Markdown", package: "swift-markdown"),
.product(name: "SymbolKit", package: "swift-docc-symbolkit"),
.product(name: "CLMDB", package: "swift-lmdb"),
Expand All @@ -56,7 +55,6 @@ let package = Package(
name: "SwiftDocCTests",
dependencies: [
.target(name: "SwiftDocC"),
.target(name: "DocCCommon"),
.target(name: "SwiftDocCTestUtilities"),
],
resources: [
Expand All @@ -72,7 +70,6 @@ let package = Package(
name: "SwiftDocCUtilities",
dependencies: [
.target(name: "SwiftDocC"),
.target(name: "DocCCommon"),
.product(name: "NIOHTTP1", package: "swift-nio", condition: .when(platforms: [.macOS, .iOS, .linux, .android])),
.product(name: "ArgumentParser", package: "swift-argument-parser")
],
Expand All @@ -84,7 +81,6 @@ let package = Package(
dependencies: [
.target(name: "SwiftDocCUtilities"),
.target(name: "SwiftDocC"),
.target(name: "DocCCommon"),
.target(name: "SwiftDocCTestUtilities"),
],
resources: [
Expand All @@ -99,7 +95,6 @@ let package = Package(
name: "SwiftDocCTestUtilities",
dependencies: [
.target(name: "SwiftDocC"),
.target(name: "DocCCommon"),
.product(name: "SymbolKit", package: "swift-docc-symbolkit"),
],
swiftSettings: swiftSettings
Expand All @@ -114,25 +109,6 @@ let package = Package(
exclude: ["CMakeLists.txt"],
swiftSettings: swiftSettings
),

// A few common types and core functionality that's useable by all other targets.
.target(
name: "DocCCommon",
dependencies: [
// This target shouldn't have any local dependencies so that all other targets can depend on it.
// We can add dependencies on SymbolKit and Markdown here but they're not needed yet.
],
swiftSettings: [.swiftLanguageMode(.v6)]
),

.testTarget(
name: "DocCCommonTests",
dependencies: [
.target(name: "DocCCommon"),
.target(name: "SwiftDocCTestUtilities"),
],
swiftSettings: [.swiftLanguageMode(.v6)]
),

// Test app for SwiftDocCUtilities
.executableTarget(
Expand Down
10 changes: 4 additions & 6 deletions Sources/DocCCommon/SourceLanguage.swift → Sources/SwiftDocC/Model/SourceLanguage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*
This source file is part of the Swift.org open source project

Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
Licensed under Apache License v2.0 with Runtime Library Exception

See https://swift.org/LICENSE.txt for license information
See https://swift.org/CONTRIBUTORS.txt for Swift project authors
*/

/// A programming language.
public struct SourceLanguage: Hashable, Codable, Comparable, Sendable {
public struct SourceLanguage: Hashable, Codable, Comparable {
/// The display name of the programming language.
public var name: String
/// A globally unique identifier for the language.
Expand Down Expand Up @@ -132,7 +132,7 @@ public struct SourceLanguage: Hashable, Codable, Comparable, Sendable {
public static let metal = SourceLanguage(name: "Metal", id: "metal")

/// The list of programming languages that are known to DocC.
public static let knownLanguages: [SourceLanguage] = [.swift, .objectiveC, .javaScript, .data, .metal]
public static var knownLanguages: [SourceLanguage] = [.swift, .objectiveC, .javaScript, .data, .metal]

enum CodingKeys: CodingKey {
case name
Expand All @@ -157,9 +157,7 @@ public struct SourceLanguage: Hashable, Codable, Comparable, Sendable {

try container.encode(self.name, forKey: SourceLanguage.CodingKeys.name)
try container.encode(self.id, forKey: SourceLanguage.CodingKeys.id)
if !self.idAliases.isEmpty {
try container.encode(self.idAliases, forKey: SourceLanguage.CodingKeys.idAliases)
}
try container.encodeIfNotEmpty(self.idAliases, forKey: SourceLanguage.CodingKeys.idAliases)
try container.encode(self.linkDisambiguationID, forKey: SourceLanguage.CodingKeys.linkDisambiguationID)
}

Expand Down
13 changes: 0 additions & 13 deletions Sources/SwiftDocC/Utility/CommonTypeExports.swift
View file
Open in desktop

This file was deleted.

0 Sources/CommandLine/CMakeLists.txt → Sources/SwiftDocCUtilities/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...DocCCommonTests/SourceLanguageTests.swift → ...DocCTests/Model/SourceLanguageTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
See https://swift.org/CONTRIBUTORS.txt for Swift project authors
*/

import DocCCommon
@testable import SwiftDocC
import XCTest

class SourceLanguageTests: XCTestCase {
Expand Down