From a5b21d4074c5244c798785ae5455cb607025151c Mon Sep 17 00:00:00 2001 From: uhooi Date: Sat, 20 Apr 2024 01:17:17 +0900 Subject: [PATCH 1/2] Bump Logdog to 0.2.0 --- Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved | 6 +++--- LokiPackage/Package.swift | 2 +- LokiPackage/Sources/Features/Debug/Debug/DebugScreen.swift | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved index b619ba0..0dc1971 100644 --- a/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "b6e6dc27a8693bcc379114dac7408c67206ba448b6fd1c6f3f26cb9916e6854a", + "originHash" : "5c355bb964e4d700868e085dcb7bafa860fe89cfa2a3098d390e6b6f010261d8", "pins" : [ { "identity" : "licensesplugin", @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/uhooi/Logdog.git", "state" : { - "branch" : "main", - "revision" : "bceaa67c1ae9b3f30c05c051431ce5644befbac5" + "revision" : "1f09fa30880353cdaa5ef9fa1d67f5409ddd271f", + "version" : "0.2.0" } }, { diff --git a/LokiPackage/Package.swift b/LokiPackage/Package.swift index f88a0fb..4de697f 100644 --- a/LokiPackage/Package.swift +++ b/LokiPackage/Package.swift @@ -60,7 +60,7 @@ let package = Package( // Libraries .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.0.0"), .package(url: "https://github.com/playbook-ui/playbook-ios.git", from: "0.3.2"), - .package(url: "https://github.com/uhooi/Logdog.git", branch: "main"), // TODO: Use stable version + .package(url: "https://github.com/uhooi/Logdog.git", from: "0.2.0"), // Plugins .package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.1.5"), diff --git a/LokiPackage/Sources/Features/Debug/Debug/DebugScreen.swift b/LokiPackage/Sources/Features/Debug/Debug/DebugScreen.swift index 5cec58e..cd21957 100644 --- a/LokiPackage/Sources/Features/Debug/Debug/DebugScreen.swift +++ b/LokiPackage/Sources/Features/Debug/Debug/DebugScreen.swift @@ -9,7 +9,9 @@ package struct DebugScreen: View { Form { Section { NavigationLink(String(localized: "Log", bundle: .module)) { - LogScreen() + LogdogScreen() + .navigationTitle(String(localized: "Log", bundle: .module)) + .navigationBarTitleDisplayMode(.inline) } } } From d93f68eb71b038a7e6a2b650d4af9e3b2b1ad676 Mon Sep 17 00:00:00 2001 From: uhooi Date: Sat, 20 Apr 2024 17:48:06 +0900 Subject: [PATCH 2/2] Bump Logdog from 0.2.0 to 0.3.0 --- Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved | 6 +++--- LokiPackage/Package.swift | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0dc1971..0fb3f15 100644 --- a/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "5c355bb964e4d700868e085dcb7bafa860fe89cfa2a3098d390e6b6f010261d8", + "originHash" : "c8222e67b71e52ad42dbe97f9f64a00f8f9ca10eb16c103f0fcf6981ae37efd9", "pins" : [ { "identity" : "licensesplugin", @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/uhooi/Logdog.git", "state" : { - "revision" : "1f09fa30880353cdaa5ef9fa1d67f5409ddd271f", - "version" : "0.2.0" + "revision" : "bc02bf2122f9da59e99710d1abb5e55fe40c950b", + "version" : "0.3.0" } }, { diff --git a/LokiPackage/Package.swift b/LokiPackage/Package.swift index 4de697f..e7d415b 100644 --- a/LokiPackage/Package.swift +++ b/LokiPackage/Package.swift @@ -5,9 +5,9 @@ import PackageDescription private extension PackageDescription.Target.Dependency { static let algorithms: Self = .product(name: "Algorithms", package: "swift-algorithms") + static let logdogUI: Self = .product(name: "LogdogUI", package: "Logdog") static let playbook: Self = .product(name: "Playbook", package: "playbook-ios") static let playbookUI: Self = .product(name: "PlaybookUI", package: "playbook-ios") - static let logdogUI: Self = .product(name: "LogdogUI", package: "Logdog") } private extension PackageDescription.Target.PluginUsage { @@ -59,8 +59,8 @@ let package = Package( dependencies: [ // Libraries .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.0.0"), + .package(url: "https://github.com/uhooi/Logdog.git", from: "0.3.0"), .package(url: "https://github.com/playbook-ui/playbook-ios.git", from: "0.3.2"), - .package(url: "https://github.com/uhooi/Logdog.git", from: "0.2.0"), // Plugins .package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.1.5"),