Remove testable imports of SKCore

Author: benlangmuir

Sources/SKCore/CompilationDatabase.swift

@@ -30,6 +30,13 @@ public struct CompilationDatabaseCompileCommand: Equatable {
 
   /// The name of the build output, or nil.
   public var output: String? = nil
+
+  public init(directory: String, filename: String, commandLine: [String], output: String? = nil) {
+    self.directory = directory
+    self.filename = filename
+    self.commandLine = commandLine
+    self.output = output
+  }
 }
 
 extension CompilationDatabase.Command {

Sources/SKCore/FallbackBuildSystem.swift

@@ -17,8 +17,10 @@ import enum SPMUtility.Platform
 /// A simple BuildSystem suitable as a fallback when accurate settings are unknown.
 public final class FallbackBuildSystem: BuildSystem {
 
+  public init() {}
+
   /// The path to the SDK.
-  lazy var sdkpath: AbsolutePath? = {
+  public lazy var sdkpath: AbsolutePath? = {
     if case .darwin? = Platform.currentPlatform,
        let str = try? Process.checkNonZeroExit(
          args: "/usr/bin/xcrun", "--show-sdk-path", "--sdk", "macosx"),

Sources/SKCore/ToolchainRegistry.swift

@@ -41,7 +41,7 @@ public final class ToolchainRegistry {
   var queue: DispatchQueue = DispatchQueue(label: "toolchain-registry-queue")
 
   /// The currently selected toolchain identifier on Darwin.
-  public internal(set) lazy var darwinToolchainOverride: String? = {
+  public lazy var darwinToolchainOverride: String? = {
     if let id = ProcessEnv.vars["TOOLCHAINS"], !id.isEmpty, id != "default" {
       return id
     }
@@ -151,7 +151,7 @@ extension ToolchainRegistry {
 
 extension ToolchainRegistry {
 
-  enum Error: Swift.Error {
+  public enum Error: Swift.Error {
 
     /// There is already a toolchain with the given identifier.
     case duplicateToolchainIdentifier

Sources/SKCore/XCToolchainPlist.swift

@@ -14,13 +14,18 @@ import Basic
 import Foundation
 
 /// A helper type for decoding the Info.plist or ToolchainInfo.plist file from an .xctoolchain.
-struct XCToolchainPlist {
+public struct XCToolchainPlist {
 
   /// The toolchain identifer e.g. "com.apple.dt.toolchain.XcodeDefault".
-  var identifier: String
+  public var identifier: String
 
   /// The toolchain's human-readable name.
-  var displayName: String?
+  public var displayName: String?
+
+  public init(identifier: String, displayName: String? = nil) {
+    self.identifier = identifier
+    self.displayName = displayName
+  }
 }
 
 extension XCToolchainPlist {
@@ -79,7 +84,7 @@ extension XCToolchainPlist: Codable {
     case DisplayName
   }
 
-  init(from decoder: Decoder) throws {
+  public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     if let identifier = try container.decodeIfPresent(String.self, forKey: .Identifier) {
       self.identifier = identifier
@@ -90,7 +95,7 @@ extension XCToolchainPlist: Codable {
   }
 
   /// Encode the info plist. **For testing**.
-  func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
     if identifier.starts(with: "com.apple") {
       try container.encode(identifier, forKey: .Identifier)

Tests/SKCoreTests/CompilationDatabaseTests.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import SKCore
+import SKCore
 import Basic
 import SKTestSupport
 import XCTest

Tests/SKCoreTests/FallbackBuildSystemTests.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import SKCore
+import SKCore
 import LanguageServerProtocol
 import Basic
 import XCTest

Tests/SKCoreTests/ToolchainRegistryTests.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import SKCore
+import SKCore
 import Basic
 import SPMUtility
 import XCTest