Refactor access levels and update Swift tools version to 6.0

homerooliveira · Dec 24, 2024 · 8eed549 · 8eed549
1 parent 3c28537
commit 8eed549
Show file tree

Hide file tree

Showing 30 changed files with 50 additions and 132 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1 +1,4 @@
-{}
+{
+    "lldb.library": "/Applications/Xcode-16.2.0.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/LLDB",
+    "lldb.launch.expressions": "native"
+}
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -77,9 +77,7 @@ let package = Package(
 for target in package.targets {
 	target.swiftSettings = (target.swiftSettings ?? []) + [
 		.unsafeFlags(["-warnings-as-errors"]),
-		.enableExperimentalFeature("AccessLevelOnImport"),
-		.enableExperimentalFeature("StrictConcurrency"),
 		.enableUpcomingFeature("ExistentialAny"),
-		.enableUpcomingFeature("BareSlashRegexLiterals"),
+		.enableUpcomingFeature("InternalImportsByDefault"),
 	]
 }
diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift
diff --git a/Sources/BumpCommandLine/BumpCommand.swift b/Sources/BumpCommandLine/BumpCommand.swift
@@ -1,7 +1,7 @@
 import ArgumentParser
-internal import BumpCore
-internal import Environment
-internal import Foundation
+import BumpCore
+import Environment
+import Foundation
 
 @main
 struct BumpCommand: ParsableCommand {

diff --git a/Sources/BumpCommandLine/IncrementMode+ExpressibleByArgument.swift b/Sources/BumpCommandLine/IncrementMode+ExpressibleByArgument.swift
@@ -1,4 +1,4 @@
-import ArgumentParser
-internal import BumpCore
+public import ArgumentParser
+import BumpCore
 
 extension IncrementMode: ExpressibleByArgument {}
diff --git a/Sources/BumpCore/Bump.swift b/Sources/BumpCore/Bump.swift
@@ -1,6 +1,6 @@
-internal import Foundation
-internal import SwiftExtensions
-import XcodeProjWrapper
+import Foundation
+import SwiftExtensions
+public import XcodeProjWrapper
 
 public struct Bump {
     private var xcodeProj: any XcodeProjWrapperProtocol

diff --git a/Sources/BumpCore/IncrementMode.swift b/Sources/BumpCore/IncrementMode.swift
@@ -1,4 +1,4 @@
-internal import Foundation
+import Foundation
 
 public enum IncrementMode: RawRepresentable, Equatable {
     case major

diff --git a/Sources/BumpCore/VersionIndex.swift b/Sources/BumpCore/VersionIndex.swift
@@ -1,4 +1,4 @@
-internal import Foundation
+import Foundation
 
 enum VersionIndex: Int {
     case major = 0

diff --git a/Sources/Environment/Environment.swift b/Sources/Environment/Environment.swift
@@ -1,6 +1,6 @@
-import FileManagerWrapper
+public import FileManagerWrapper
 import Foundation
-import XcodeProjWrapper
+public import XcodeProjWrapper
 
 // This struct is used to inject dependencies in the BumpCommand.
 // It is safe to use @unchecked Sendable because the properties are immutable.

diff --git a/Sources/FileManagerWrapper/FileManagerWrapper.swift b/Sources/FileManagerWrapper/FileManagerWrapper.swift
@@ -1,4 +1,4 @@
-import Foundation
+public import Foundation
 
 extension FileManager: FileManagerProtocol {
     public func contentsOfDirectory(at url: URL) throws -> [URL] {

diff --git a/Sources/FileManagerWrapper/FileManagerWrapperProtocol.swift b/Sources/FileManagerWrapper/FileManagerWrapperProtocol.swift
@@ -1,4 +1,4 @@
-import Foundation
+public import Foundation
 
 public protocol FileManagerProtocol {
     var currentDirectoryPath: String { get }

diff --git a/Sources/FileManagerWrapper/XcodeProjFinder.swift b/Sources/FileManagerWrapper/XcodeProjFinder.swift
@@ -1,4 +1,4 @@
-import Foundation
+public import Foundation
 
 public protocol XcodeProjFinderProtocol {
     func findXcodeProj(path: String?) throws -> String

diff --git a/Sources/FileManagerWrapperMock/FileManagerWrapperMock.swift b/Sources/FileManagerWrapperMock/FileManagerWrapperMock.swift
@@ -1,5 +1,5 @@
-import FileManagerWrapper
-import Foundation
+public import FileManagerWrapper
+public import Foundation
 
 public final class FileManagerWrapperMock: FileManagerProtocol {
     public var currentDirectoryPath: String = ""

diff --git a/Sources/FileManagerWrapperMock/XcodeProjFinderMock.swift b/Sources/FileManagerWrapperMock/XcodeProjFinderMock.swift
@@ -1,4 +1,4 @@
-import FileManagerWrapper
+public import FileManagerWrapper
 import Foundation
 
 public final class XcodeProjFinderMock: XcodeProjFinderProtocol {

diff --git a/Sources/XcodeProjWrapper/BuildConfiguration.swift b/Sources/XcodeProjWrapper/BuildConfiguration.swift
@@ -1,5 +1,5 @@
 private import SwiftExtensions
-internal import XcodeProj
+import XcodeProj
 import Foundation
 
 private enum BuildSettingKey: String {

diff --git a/Sources/XcodeProjWrapper/Target.swift b/Sources/XcodeProjWrapper/Target.swift
@@ -1,4 +1,4 @@
-internal import XcodeProj
+import XcodeProj
 
 public struct Target {
     public let name: String

diff --git a/Sources/XcodeProjWrapper/XcodeProjWrapper.swift b/Sources/XcodeProjWrapper/XcodeProjWrapper.swift
@@ -1,5 +1,5 @@
 private import PathKit
-internal import XcodeProj
+import XcodeProj
 import Foundation
 
 public struct XcodeProjWrapper: XcodeProjWrapperProtocol {

diff --git a/Sources/XcodeProjWrapperMock/BuildConfigurationMock.swift b/Sources/XcodeProjWrapperMock/BuildConfigurationMock.swift
@@ -1,4 +1,4 @@
 import Foundation
-import XcodeProjWrapper
+public import XcodeProjWrapper
 
 public typealias BuildConfigurationMock = BuildConfiguration
diff --git a/Sources/XcodeProjWrapperMock/TargetMock.swift b/Sources/XcodeProjWrapperMock/TargetMock.swift
@@ -1,3 +1,3 @@
-import XcodeProjWrapper
+public import XcodeProjWrapper
 
 public typealias TargetMock = Target
diff --git a/Sources/XcodeProjWrapperMock/XcodeProjWrapperMock.swift b/Sources/XcodeProjWrapperMock/XcodeProjWrapperMock.swift
@@ -1,4 +1,4 @@
-import XcodeProjWrapper
+public import XcodeProjWrapper
 
 public final class XcodeProjWrapperMock: XcodeProjWrapperProtocol {
     public var targets: [Target]

diff --git a/Tests/BumpCommandLineIntegrationTests/BumpCommandTests.swift b/Tests/BumpCommandLineIntegrationTests/BumpCommandTests.swift
@@ -1,11 +1,11 @@
-internal import ArgumentParser
-internal import Environment
-internal import FileManagerWrapper
-internal import XcodeProjWrapper
+import ArgumentParser
+import Environment
+import FileManagerWrapper
+import XcodeProjWrapper
 import Foundation
 import XCTest
 
-@testable internal import BumpCommandLine
+@testable import BumpCommandLine
 
 final class BumpCommandIntegrationTests: XCTestCase {
     private var logs: [String] = []

diff --git a/Tests/BumpCommandLineTests/BumpCommandTests.swift b/Tests/BumpCommandLineTests/BumpCommandTests.swift
@@ -1,11 +1,11 @@
-internal import ArgumentParser
-internal import Environment
-internal import FileManagerWrapperMock
-internal import XcodeProjWrapperMock
+import ArgumentParser
+import Environment
+import FileManagerWrapperMock
+import XcodeProjWrapperMock
 import Foundation
 import XCTest
 
-@testable internal import BumpCommandLine
+@testable import BumpCommandLine
 
 final class BumpCommandTests: XCTestCase {
     private var xcodeProjFinderMock = XcodeProjFinderMock()

diff --git a/Tests/BumpCoreTests/BumpCoreTests.swift b/Tests/BumpCoreTests/BumpCoreTests.swift
@@ -1,7 +1,7 @@
-internal import XcodeProjWrapperMock
+import XcodeProjWrapperMock
 import XCTest
 
-@testable internal import BumpCore
+@testable import BumpCore
 
 final class BumpCoreTests: XCTestCase {
     func testBumpBuild() throws {

diff --git a/Tests/BumpCoreTests/BumpCoreTests2.swift b/Tests/BumpCoreTests/BumpCoreTests2.swift
@@ -1,7 +1,7 @@
-internal import XcodeProjWrapperMock
+import XcodeProjWrapperMock
 import XCTest
 
-@testable internal import BumpCore
+@testable import BumpCore
 
 final class BumpCoreTests2: XCTestCase {
     func testGetConfigurationsByTargetNameWithAllAsBundleIdentifier() throws {

diff --git a/Tests/BumpCoreTests/IncrementModeTests.swift b/Tests/BumpCoreTests/IncrementModeTests.swift
@@ -1,7 +1,7 @@
 import Foundation
 import XCTest
 
-@testable internal import BumpCore
+@testable import BumpCore
 
 final class IncrementModeTests: XCTestCase {
     func testRawValue() throws {

diff --git a/Tests/BumpCoreTests/Mock/XcodeProjWrapperMock+mock.swift b/Tests/BumpCoreTests/Mock/XcodeProjWrapperMock+mock.swift
@@ -1,4 +1,4 @@
-internal import XcodeProjWrapperMock
+import XcodeProjWrapperMock
 
 extension XcodeProjWrapperMock {
     static var mock: XcodeProjWrapperMock {

diff --git a/Tests/FileManagerWrapperTests/URLTests.swift b/Tests/FileManagerWrapperTests/URLTests.swift
@@ -1,7 +1,7 @@
 import Foundation
 import XCTest
 
-@testable internal import FileManagerWrapper
+@testable import FileManagerWrapper
 
 final class URLTests: XCTestCase {
     func testIsXcodeProjTrue() throws {

diff --git a/Tests/FileManagerWrapperTests/XcodeFinderProjTests.swift b/Tests/FileManagerWrapperTests/XcodeFinderProjTests.swift
@@ -1,7 +1,7 @@
 import FileManagerWrapperMock
 import XCTest
 
-@testable internal import FileManagerWrapper
+@testable import FileManagerWrapper
 
 final class XcodeProjFinderTests: XCTestCase {
     private let fileManagerWrapperMock = FileManagerWrapperMock()

diff --git a/Tests/SwiftExtensionsTests/ArrayExtensionsTests.swift b/Tests/SwiftExtensionsTests/ArrayExtensionsTests.swift
@@ -1,7 +1,7 @@
 import Foundation
 import XCTest
 
-@testable internal import SwiftExtensions
+@testable import SwiftExtensions
 
 final class ArrayExtensionsTests: XCTestCase {
     func testSubscriptGet() throws {

diff --git a/Tests/SwiftExtensionsTests/DictonaryExtensionsTests.swift b/Tests/SwiftExtensionsTests/DictonaryExtensionsTests.swift
@@ -1,7 +1,7 @@
 import Foundation
 import XCTest
 
-@testable internal import SwiftExtensions
+@testable import SwiftExtensions
 
 final class DictonaryExtensionsTests: XCTestCase {
     func testSubscriptGet() throws {