From a3956f0ff8f599ee46f90ef0193715caaa3928ac Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Thu, 6 Jun 2024 08:32:24 -0700
Subject: [PATCH] Remove swiftlint from widgets

---
 Meshtastic.xcodeproj/project.pbxproj   | 10 ----------
 Meshtastic/Views/Settings/AppLog.swift |  9 ++++-----
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
index a56dad4e..40d646aa 100644
--- a/Meshtastic.xcodeproj/project.pbxproj
+++ b/Meshtastic.xcodeproj/project.pbxproj
@@ -1036,7 +1036,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				258EE1252C0E826E0025A5FB /* PBXTargetDependency */,
 			);
 			name = WidgetsExtension;
 			productName = WidgetsExtension;
@@ -1350,10 +1349,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		258EE1252C0E826E0025A5FB /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = 258EE1242C0E826E0025A5FB /* SwiftLintBuildToolPlugin */;
-		};
 		DDDE5A0229AF163E00490C6C /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			platformFilter = ios;
@@ -1709,11 +1704,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		258EE1242C0E826E0025A5FB /* SwiftLintBuildToolPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 258EE1212C0E81AE0025A5FB /* XCRemoteSwiftPackageReference "SwiftLint" */;
-			productName = "plugin:SwiftLintBuildToolPlugin";
-		};
 		C9697FA427933B8C00250207 /* SQLite */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = C9697FA327933B8C00250207 /* XCRemoteSwiftPackageReference "SQLite.swift" */;
diff --git a/Meshtastic/Views/Settings/AppLog.swift b/Meshtastic/Views/Settings/AppLog.swift
index df6ab9bd..8f8db623 100644
--- a/Meshtastic/Views/Settings/AppLog.swift
+++ b/Meshtastic/Views/Settings/AppLog.swift
@@ -99,11 +99,10 @@ extension AppLog {
 	@MainActor
 	private func fetchLogs() async -> [OSLogEntryLog] {
 		do {
-			let predicate = AppLog.template.withSubstitutionVariables(
-				[
-					"PREFIX": "gvh.MeshtasticClient",
-					"SYSTEM": ["com.apple.coredata"]
-				])
+			let predicate = NSPredicate(format: "subsystem IN %@", [
+			  "com.apple.coredata",
+			  "gvh.MeshtasticClient"
+			])
 			let logs = try await Logger.fetch(predicateFormat: predicate.predicateFormat)
 			return logs
 		} catch {