From 35212a6154a36d2e77ca5f3b63f6218e5ebb38e7 Mon Sep 17 00:00:00 2001
From: Elliott Williams <code@emw.ms>
Date: Fri, 30 Apr 2021 20:39:34 -0700
Subject: [PATCH] Rename `Core` to avoid collisions with other packages (i.e.
 GraphViz) (#1057)

* Rename 'Core' to 'XcodeGenCore'

* Update CHANGELOG.md

* Update CHANGELOG.md
---
 CHANGELOG.md                                           |  1 +
 Package.swift                                          | 10 +++++-----
 Sources/ProjectSpec/CacheFile.swift                    |  2 +-
 Sources/XcodeGenCLI/Commands/ProjectCommand.swift      |  2 +-
 Sources/{Core => XcodeGenCore}/Glob.swift              |  0
 Sources/{Core => XcodeGenCore}/MD5.swift               |  0
 Sources/{Core => XcodeGenCore}/PathExtensions.swift    |  0
 Sources/{Core => XcodeGenCore}/StringDiff.swift        |  0
 Sources/XcodeGenKit/SourceGenerator.swift              |  2 +-
 Tests/{CoreTests => XcodeGenCoreTests}/GlobTests.swift |  2 +-
 .../PathExtensionsTests.swift                          |  2 +-
 11 files changed, 11 insertions(+), 10 deletions(-)
 rename Sources/{Core => XcodeGenCore}/Glob.swift (100%)
 rename Sources/{Core => XcodeGenCore}/MD5.swift (100%)
 rename Sources/{Core => XcodeGenCore}/PathExtensions.swift (100%)
 rename Sources/{Core => XcodeGenCore}/StringDiff.swift (100%)
 rename Tests/{CoreTests => XcodeGenCoreTests}/GlobTests.swift (99%)
 rename Tests/{CoreTests => XcodeGenCoreTests}/PathExtensionsTests.swift (99%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81c6e07b..e0c313c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 
 #### Internal
 - Build universal binaries for release. XcodeGen now runs natively on Apple Silicon. [#1024](https://github.com/yonaskolb/XcodeGen/pull/1024) @thii
+- The `Core` target is renamed to avoid collisions with other packages. [#1057](https://github.com/yonaskolb/XcodeGen/pull/1057) @elliottwilliams
 
 [Commits](https://github.com/yonaskolb/XcodeGen/compare/2.19.0...2.20.0)
 
diff --git a/Package.swift b/Package.swift
index 3d5c5b40..3db1b934 100644
--- a/Package.swift
+++ b/Package.swift
@@ -39,17 +39,17 @@ let package = Package(
             "JSONUtilities",
             "XcodeProj",
             "PathKit",
-            "Core",
+            "XcodeGenCore",
             "GraphViz",
         ]),
         .target(name: "ProjectSpec", dependencies: [
             "JSONUtilities",
             "XcodeProj",
             "Yams",
-            "Core",
+            "XcodeGenCore",
             "Version",
         ]),
-        .target(name: "Core", dependencies: [
+        .target(name: "XcodeGenCore", dependencies: [
             "PathKit",
             "Yams",
         ]),
@@ -70,8 +70,8 @@ let package = Package(
             "PathKit",
             "TestSupport",
         ]),
-        .testTarget(name: "CoreTests", dependencies: [
-            "Core",
+        .testTarget(name: "XcodeGenCoreTests", dependencies: [
+            "XcodeGenCore",
             "Spectre",
             "PathKit",
             "TestSupport",
diff --git a/Sources/ProjectSpec/CacheFile.swift b/Sources/ProjectSpec/CacheFile.swift
index 10e21afd..c9c64692 100644
--- a/Sources/ProjectSpec/CacheFile.swift
+++ b/Sources/ProjectSpec/CacheFile.swift
@@ -1,5 +1,5 @@
 import Foundation
-import Core
+import XcodeGenCore
 import Version
 
 public class CacheFile {
diff --git a/Sources/XcodeGenCLI/Commands/ProjectCommand.swift b/Sources/XcodeGenCLI/Commands/ProjectCommand.swift
index 7866661a..c4796778 100644
--- a/Sources/XcodeGenCLI/Commands/ProjectCommand.swift
+++ b/Sources/XcodeGenCLI/Commands/ProjectCommand.swift
@@ -3,7 +3,7 @@ import SwiftCLI
 import ProjectSpec
 import XcodeGenKit
 import PathKit
-import Core
+import XcodeGenCore
 import Version
 
 class ProjectCommand: Command {
diff --git a/Sources/Core/Glob.swift b/Sources/XcodeGenCore/Glob.swift
similarity index 100%
rename from Sources/Core/Glob.swift
rename to Sources/XcodeGenCore/Glob.swift
diff --git a/Sources/Core/MD5.swift b/Sources/XcodeGenCore/MD5.swift
similarity index 100%
rename from Sources/Core/MD5.swift
rename to Sources/XcodeGenCore/MD5.swift
diff --git a/Sources/Core/PathExtensions.swift b/Sources/XcodeGenCore/PathExtensions.swift
similarity index 100%
rename from Sources/Core/PathExtensions.swift
rename to Sources/XcodeGenCore/PathExtensions.swift
diff --git a/Sources/Core/StringDiff.swift b/Sources/XcodeGenCore/StringDiff.swift
similarity index 100%
rename from Sources/Core/StringDiff.swift
rename to Sources/XcodeGenCore/StringDiff.swift
diff --git a/Sources/XcodeGenKit/SourceGenerator.swift b/Sources/XcodeGenKit/SourceGenerator.swift
index 72b1d1c8..c3987b74 100644
--- a/Sources/XcodeGenKit/SourceGenerator.swift
+++ b/Sources/XcodeGenKit/SourceGenerator.swift
@@ -2,7 +2,7 @@ import Foundation
 import PathKit
 import ProjectSpec
 import XcodeProj
-import Core
+import XcodeGenCore
 
 struct SourceFile {
     let path: Path
diff --git a/Tests/CoreTests/GlobTests.swift b/Tests/XcodeGenCoreTests/GlobTests.swift
similarity index 99%
rename from Tests/CoreTests/GlobTests.swift
rename to Tests/XcodeGenCoreTests/GlobTests.swift
index 596ada74..10147951 100644
--- a/Tests/CoreTests/GlobTests.swift
+++ b/Tests/XcodeGenCoreTests/GlobTests.swift
@@ -7,7 +7,7 @@
 //  Adapted from https://gist.github.com/efirestone/ce01ae109e08772647eb061b3bb387c3
 
 import XCTest
-@testable import Core
+@testable import XcodeGenCore
 
 class GlobTests: XCTestCase {
 
diff --git a/Tests/CoreTests/PathExtensionsTests.swift b/Tests/XcodeGenCoreTests/PathExtensionsTests.swift
similarity index 99%
rename from Tests/CoreTests/PathExtensionsTests.swift
rename to Tests/XcodeGenCoreTests/PathExtensionsTests.swift
index ee9fd6e7..d3bdc8b7 100644
--- a/Tests/CoreTests/PathExtensionsTests.swift
+++ b/Tests/XcodeGenCoreTests/PathExtensionsTests.swift
@@ -1,7 +1,7 @@
 import Spectre
 import PathKit
 import XCTest
-import Core
+import XcodeGenCore
 import TestSupport
 
 class PathExtensionsTests: XCTestCase {