Prevent public enum from having the same name as the framework

hotwired · Nov 17, 2023 · 4f9c29a · 4f9c29a
1 parent 5894d0f
commit 4f9c29a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Demo/AppDelegate.swift b/Demo/AppDelegate.swift
@@ -6,7 +6,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         #if DEBUG
-        Turbo.config.debugLoggingEnabled = true
+        TurboConfig.shared.debugLoggingEnabled = true
         Strada.config.debugLoggingEnabled = true
         #endif
 

diff --git a/Source/Turbo Navigator/TurboNavigator.swift b/Source/Turbo Navigator/TurboNavigator.swift
@@ -48,10 +48,10 @@ public class TurboNavigator {
     ///   - pathConfiguration: an optional remote configuration reference
     ///   - delegate: an optional delegate to handle custom view controllers
     public convenience init(pathConfiguration: PathConfiguration? = nil, delegate: TurboNavigatorDelegate? = nil) {
-        let session = Session(webView: Turbo.config.makeWebView())
+        let session = Session(webView: TurboConfig.shared.makeWebView())
         session.pathConfiguration = pathConfiguration
 
-        let modalSession = Session(webView: Turbo.config.makeWebView())
+        let modalSession = Session(webView: TurboConfig.shared.makeWebView())
         modalSession.pathConfiguration = pathConfiguration
 
         self.init(session: session, modalSession: modalSession, delegate: delegate)

diff --git a/Source/Turbo.swift b/Source/Turbo.swift
@@ -1,10 +1,11 @@
 import WebKit
 
-public enum Turbo {
-    public static var config = TurboConfig()
-}
-
 public class TurboConfig {
+
+    public static let shared = TurboConfig()
+
+    private init() { }
+
     public typealias WebViewBlock = (_ configuration: WKWebViewConfiguration) -> WKWebView
 
     /// Override to set a custom user agent.