Skip to content
This repository was archived by the owner on Oct 17, 2021. It is now read-only.

Prefix target names with 'GraphViz' to avoid collisions #17

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ let package = Package(
]),
.target(
name: "GraphViz",
dependencies: ["Core", "DOT", "Builder", "Tools"]),
dependencies: ["GraphVizCore", "DOT", "GraphVizBuilder", "GraphVizTools"]),
.target(
name: "Core",
name: "GraphVizCore",
dependencies: []),
.target(
name: "DOT",
dependencies: ["Core"]),
dependencies: ["GraphVizCore"]),
.target(
name: "Builder",
dependencies: ["Core"]),
name: "GraphVizBuilder",
dependencies: ["GraphVizCore"]),
.target(
name: "Tools",
dependencies: ["Core", "DOT", "Clibgraphviz"]),
name: "GraphVizTools",
dependencies: ["GraphVizCore", "DOT", "Clibgraphviz"]),
.testTarget(
name: "GraphVizTests",
dependencies: ["Core", "DOT", "Builder", "Tools"]),
dependencies: ["GraphVizCore", "DOT", "GraphVizBuilder", "GraphVizTools"]),
]
)
2 changes: 1 addition & 1 deletion Sources/DOT/DOTEncoder.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

/// Creates DOT language representations of GraphViz graphs.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/DOT/DOTRepresentable.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import Core
import GraphVizCore

protocol DOTRepresentable {
func representation(in graph: Graph) -> String?
Expand Down
6 changes: 3 additions & 3 deletions Sources/GraphViz/Graphviz.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@_exported import Core
@_exported import GraphVizCore
@_exported import DOT
@_exported import Builder
@_exported import Tools
@_exported import GraphVizBuilder
@_exported import GraphVizTools
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

extension Edge {
public subscript<T>(dynamicMember member: WritableKeyPath<Attributes, T>) -> (T) -> Self {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

extension Graph {
typealias Fragment = GraphBuilder.Fragment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

extension Node {
public subscript<T>(dynamicMember member: WritableKeyPath<Attributes, T>) -> (T) -> Self {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

extension Subgraph {
typealias Fragment = SubgraphBuilder.Fragment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

public protocol GraphMember {}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

infix operator <-- : AdditionPrecedence

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

infix operator <-> : AdditionPrecedence

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

infix operator --> : AdditionPrecedence

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

infix operator --- : AdditionPrecedence

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Core
import GraphVizCore

public protocol SubgraphMember {}

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import Dispatch

import Core
import GraphVizCore

extension Graph {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import Dispatch

import Core
import GraphVizCore
import DOT
import Clibgraphviz

Expand Down
2 changes: 1 addition & 1 deletion Tests/GraphVizTests/AttributesTest.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import XCTest
@testable import Core
@testable import GraphVizCore

final class AttributesTests: XCTestCase {
func testGraphAttributesCompleteness() {
Expand Down
2 changes: 1 addition & 1 deletion Tests/GraphVizTests/EdgeTests.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import XCTest
import Core
import GraphVizCore
@testable import DOT

final class EdgeTests: XCTestCase {
Expand Down
4 changes: 2 additions & 2 deletions Tests/GraphVizTests/GraphBuilderTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import XCTest
import Core
import GraphVizCore
import DOT
@testable import Builder
@testable import GraphVizBuilder

// Workaround for "error: ambiguous reference to member '-->'" on Swift 5.1
#if swift(>=5.2)
Expand Down
2 changes: 1 addition & 1 deletion Tests/GraphVizTests/GraphTests.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import XCTest
import Core
import GraphVizCore
import DOT

final class GraphTests: XCTestCase {
Expand Down
2 changes: 1 addition & 1 deletion Tests/GraphVizTests/NodeTests.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import XCTest
import Core
import GraphVizCore
@testable import DOT

final class NodeTests: XCTestCase {
Expand Down
4 changes: 2 additions & 2 deletions Tests/GraphVizTests/RenderingTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import XCTest
@testable import Core
@testable import GraphVizCore
@testable import DOT
@testable import Tools
@testable import GraphVizTools

final class RenderingTests: XCTestCase {
let encoder = DOTEncoder()
Expand Down
4 changes: 2 additions & 2 deletions Tests/GraphVizTests/SubgraphBuilderTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import XCTest
import Core
import GraphVizCore
@testable import DOT
@testable import Builder
@testable import GraphVizBuilder

// Workaround for "error: ambiguous reference to member '-->'" on Swift 5.1
#if swift(>=5.2)
Expand Down
2 changes: 1 addition & 1 deletion Tests/GraphVizTests/SubgraphTests.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import XCTest
import Core
import GraphVizCore
@testable import DOT

final class SubgraphTests: XCTestCase {
Expand Down