From 4b848fd3bce306d3af5bbd7c462c4d98693df013 Mon Sep 17 00:00:00 2001 From: Wouter Hennen <62355975+Wouter01@users.noreply.github.com> Date: Sat, 4 May 2024 17:17:47 +0200 Subject: [PATCH] Update LogStream version, remove build setting (#1685) * update logstream version, remove build setting --- CodeEdit.xcodeproj/project.pbxproj | 44 +++++++++---------- .../xcshareddata/swiftpm/Package.resolved | 8 ++-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj index 01fa7af19..a00ba8740 100644 --- a/CodeEdit.xcodeproj/project.pbxproj +++ b/CodeEdit.xcodeproj/project.pbxproj @@ -287,6 +287,7 @@ 61A53A812B4449F00093BF8A /* WorkspaceDocument+Index.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61A53A802B4449F00093BF8A /* WorkspaceDocument+Index.swift */; }; 6C049A372A49E2DB00D42923 /* DirectoryEventStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C049A362A49E2DB00D42923 /* DirectoryEventStream.swift */; }; 6C05A8AF284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C05A8AE284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift */; }; + 6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0617D52BDB4432008C9C42 /* LogStream */; }; 6C092EDA2A53A58600489202 /* EditorLayout+StateRestoration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C092ED92A53A58600489202 /* EditorLayout+StateRestoration.swift */; }; 6C092EE02A53BFCF00489202 /* WorkspaceStateKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C092EDF2A53BFCF00489202 /* WorkspaceStateKey.swift */; }; 6C0D0C6829E861B000AE4D3F /* SettingsSidebarFix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C0D0C6729E861B000AE4D3F /* SettingsSidebarFix.swift */; }; @@ -303,7 +304,6 @@ 6C18620A298BF5A800C663EA /* RecentProjectsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C186209298BF5A800C663EA /* RecentProjectsListView.swift */; }; 6C1CC9982B1E770B0002349B /* AsyncFileIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1CC9972B1E770B0002349B /* AsyncFileIterator.swift */; }; 6C1CC99B2B1E7CBC0002349B /* FindNavigatorIndexBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1CC99A2B1E7CBC0002349B /* FindNavigatorIndexBar.swift */; }; - 6C2149412A1BB9AB00748382 /* LogStream in Frameworks */ = {isa = PBXBuildFile; productRef = 6C2149402A1BB9AB00748382 /* LogStream */; }; 6C2C155829B4F49100EA60A5 /* SplitViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C2C155729B4F49100EA60A5 /* SplitViewItem.swift */; }; 6C2C155A29B4F4CC00EA60A5 /* Variadic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C2C155929B4F4CC00EA60A5 /* Variadic.swift */; }; 6C2C155D29B4F4E500EA60A5 /* SplitViewReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C2C155C29B4F4E500EA60A5 /* SplitViewReader.swift */; }; @@ -1073,9 +1073,9 @@ 6C0F3A3C2A1D0D5000223D19 /* CodeEditKit in Frameworks */, 6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */, 58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */, - 6C2149412A1BB9AB00748382 /* LogStream in Frameworks */, 6CBE1D002B720565003AC32E /* CodeEditSourceEditor in Frameworks */, 6C147C4529A329350089B630 /* OrderedCollections in Frameworks */, + 6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */, 6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */, 6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */, 5879828A292ED15F0085B254 /* SwiftTerm in Frameworks */, @@ -3068,11 +3068,11 @@ 6C6BD6F329CD142C00235D17 /* CollectionConcurrencyKit */, 6C6BD6F729CD14D100235D17 /* CodeEditKit */, 6C66C31229D05CDC00DE9ED2 /* GRDB */, - 6C2149402A1BB9AB00748382 /* LogStream */, 6CDEFC9529E22C2700B7C684 /* Introspect */, 6C0F3A3B2A1D0D5000223D19 /* CodeEditKit */, 6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */, 6CBE1CFF2B720565003AC32E /* CodeEditSourceEditor */, + 6C0617D52BDB4432008C9C42 /* LogStream */, ); productName = CodeEdit; productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */; @@ -3164,10 +3164,10 @@ 6C147C4329A329350089B630 /* XCRemoteSwiftPackageReference "swift-collections" */, 6C6BD6F229CD142C00235D17 /* XCRemoteSwiftPackageReference "collectionconcurrencykit" */, 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */, - 6C21493F2A1BB9AB00748382 /* XCRemoteSwiftPackageReference "LogStream" */, 6CDEFC9429E22C2700B7C684 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */, 6C0F3A3A2A1D0D5000223D19 /* XCRemoteSwiftPackageReference "CodeEditKit" */, 6CBE1CFE2B720565003AC32E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */, + 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */, ); productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */; projectDirPath = ""; @@ -3854,7 +3854,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_SDK_DIR)/MacOSX.sdk/System/Library/PrivateFrameworks"; + SYSTEM_FRAMEWORK_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; }; name = Alpha; @@ -4044,7 +4044,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_SDK_DIR)/MacOSX.sdk/System/Library/PrivateFrameworks"; + SYSTEM_FRAMEWORK_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; }; name = Beta; @@ -4301,7 +4301,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_SDK_DIR)/MacOSX.sdk/System/Library/PrivateFrameworks"; + SYSTEM_FRAMEWORK_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; }; name = Pre; @@ -4498,7 +4498,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_SDK_DIR)/MacOSX.sdk/System/Library/PrivateFrameworks"; + SYSTEM_FRAMEWORK_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -4560,7 +4560,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_SDK_DIR)/MacOSX.sdk/System/Library/PrivateFrameworks"; + SYSTEM_FRAMEWORK_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -4859,6 +4859,14 @@ version = 2.3.0; }; }; + 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Wouter01/LogStream"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.3.0; + }; + }; 6C0F3A3A2A1D0D5000223D19 /* XCRemoteSwiftPackageReference "CodeEditKit" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/CodeEditApp/CodeEditKit"; @@ -4875,14 +4883,6 @@ minimumVersion = 1.0.0; }; }; - 6C21493F2A1BB9AB00748382 /* XCRemoteSwiftPackageReference "LogStream" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/CodeEditApp/LogStream"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; - }; - }; 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/groue/GRDB.swift.git"; @@ -4938,6 +4938,11 @@ package = 58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */; productName = Sparkle; }; + 6C0617D52BDB4432008C9C42 /* LogStream */ = { + isa = XCSwiftPackageProductDependency; + package = 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */; + productName = LogStream; + }; 6C0F3A3B2A1D0D5000223D19 /* CodeEditKit */ = { isa = XCSwiftPackageProductDependency; package = 6C0F3A3A2A1D0D5000223D19 /* XCRemoteSwiftPackageReference "CodeEditKit" */; @@ -4948,11 +4953,6 @@ package = 6C147C4329A329350089B630 /* XCRemoteSwiftPackageReference "swift-collections" */; productName = OrderedCollections; }; - 6C2149402A1BB9AB00748382 /* LogStream */ = { - isa = XCSwiftPackageProductDependency; - package = 6C21493F2A1BB9AB00748382 /* XCRemoteSwiftPackageReference "LogStream" */; - productName = LogStream; - }; 6C66C31229D05CDC00DE9ED2 /* GRDB */ = { isa = XCSwiftPackageProductDependency; package = 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */; diff --git a/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6034fa8af..cb92aa4d4 100644 --- a/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "3f6921a5ec30d1ecb6d6b205cf27a816c318246bb00f0ea367b997cc66527d32", + "originHash" : "029e3feb7277e502c419e04acfc23af6dd70755f3984e9902ec582890724706b", "pins" : [ { "identity" : "anycodable", @@ -85,10 +85,10 @@ { "identity" : "logstream", "kind" : "remoteSourceControl", - "location" : "https://github.com/CodeEditApp/LogStream", + "location" : "https://github.com/Wouter01/LogStream", "state" : { - "revision" : "afd2422c65c12822f26606408b4e39b9549c5e1a", - "version" : "1.2.1" + "revision" : "5378bafdbf5de66b69da8cca9df9d16e19bfcf89", + "version" : "1.3.0" } }, {