Fix Logger name conflict

allenhumphreys · allenhumphreys · commit 4406cfbfa4b4 · 2023-06-09T11:52:19.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,6 @@ __MACOSX
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-*.xcworkspace
-!default.xcworkspace
 xcuserdata
 profile
 *.moved-aside
@@ -19,4 +17,4 @@ generatechangelog.sh
 Pods/
 Carthage
 Provisioning
-TeamID.xcconfig
+TeamID.xcconfig
diff --git a/Packages/ConfCore/ConfCore/ConfCoreExports.swift b/Packages/ConfCore/ConfCore/ConfCoreExports.swift
@@ -7,5 +7,4 @@
 //
 
 @_exported import Foundation
-@_exported import RealmSwift
 @_exported import Siesta
diff --git a/Packages/ConfCore/ConfCore/StorageMigrator.swift b/Packages/ConfCore/ConfCore/StorageMigrator.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import RealmSwift
+import class RealmSwift.Migration
 import OSLog
 
 final class StorageMigrator: Logging {
diff --git a/WWDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/WWDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/WWDC.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WWDC.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/WWDC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WWDC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/WWDC/ExploreTabProvider.swift b/WWDC/ExploreTabProvider.swift
@@ -3,6 +3,7 @@ import SwiftUI
 import Combine
 import ConfCore
 import RxSwift
+import RealmSwift
 
 final class ExploreTabProvider: ObservableObject {
     let storage: Storage
