From 4c31afaad868f9963a53bc45576fea87bc362594 Mon Sep 17 00:00:00 2001 From: Thilo Molitor Date: Tue, 24 Dec 2024 08:01:28 +0100 Subject: [PATCH] Move ExyteChat dependency from local to our remote fork --- Monal/Monal.xcodeproj/project.pbxproj | 32 ++++++++++++++----- .../xcshareddata/swiftpm/Package.resolved | 16 +++++----- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/Monal/Monal.xcodeproj/project.pbxproj b/Monal/Monal.xcodeproj/project.pbxproj index 63b461b2a..bc01d5a83 100644 --- a/Monal/Monal.xcodeproj/project.pbxproj +++ b/Monal/Monal.xcodeproj/project.pbxproj @@ -156,6 +156,8 @@ 845EFFBE2918723D00C1E03E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C1E4654624EE517000CA5AAF /* Localizable.strings */; }; 846DF27C2937FAA600AAB9C0 /* ChatPlaceholder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846DF27B2937FAA600AAB9C0 /* ChatPlaceholder.swift */; }; 847311232C893D2600739CC6 /* ChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847311222C893D2600739CC6 /* ChatView.swift */; }; + 84774DF52D1A935000B15E51 /* ExyteChat in Frameworks */ = {isa = PBXBuildFile; productRef = 84774DF42D1A935000B15E51 /* ExyteChat */; }; + 84774DF82D1A939300B15E51 /* ExyteChat in Frameworks */ = {isa = PBXBuildFile; productRef = 84774DF72D1A939300B15E51 /* ExyteChat */; }; 848227912C4A6194003CCA33 /* MLPlaceholderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 848227902C4A6194003CCA33 /* MLPlaceholderViewController.m */; }; 848717F3295ED64600B8D288 /* MLCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 848717F1295ED64500B8D288 /* MLCall.m */; }; 848904A9289C82C30097E19C /* SCRAM.m in Sources */ = {isa = PBXBuildFile; fileRef = 848904A8289C82C30097E19C /* SCRAM.m */; }; @@ -791,10 +793,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 84774DF52D1A935000B15E51 /* ExyteChat in Frameworks */, 843DC1B22C8E51E3002724FE /* ExyteChat in Frameworks */, 261E542523A0A1D300394F59 /* monalxmpp.framework in Frameworks */, 84F194D12C15197200F0A994 /* FrameUp in Frameworks */, C176F1EC2AF11C31002034E5 /* UserNotifications.framework in Frameworks */, + 84774DF82D1A939300B15E51 /* ExyteChat in Frameworks */, C1F5C7AF2777638B0001F295 /* OrderedCollections in Frameworks */, 841898AA2957712000FEC77D /* ViewExtractor in Frameworks */, 7D40218FEAB3BA882811A682 /* Pods_Monal.framework in Frameworks */, @@ -1558,6 +1562,8 @@ 841898A92957712000FEC77D /* ViewExtractor */, 84F194D02C15197200F0A994 /* FrameUp */, 843DC1B12C8E51E3002724FE /* ExyteChat */, + 84774DF42D1A935000B15E51 /* ExyteChat */, + 84774DF72D1A939300B15E51 /* ExyteChat */, ); productName = SworIM; productReference = 26080210110ABA4E005E194D /* Monal.app */; @@ -1774,7 +1780,7 @@ 849ADF3D2BACF0360009BCD7 /* XCRemoteSwiftPackageReference "cocoalumberjack" */, 84F194CF2C15197200F0A994 /* XCRemoteSwiftPackageReference "FrameUp" */, 84E231F12C16A9CE00735FB7 /* XCRemoteSwiftPackageReference "SVGView" */, - 843DC1B02C8E51E3002724FE /* XCLocalSwiftPackageReference "../../ExyteChat" */, + 84774DF62D1A939300B15E51 /* XCRemoteSwiftPackageReference "ExyteChat" */, ); productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; @@ -4665,13 +4671,6 @@ }; /* End XCConfigurationList section */ -/* Begin XCLocalSwiftPackageReference section */ - 843DC1B02C8E51E3002724FE /* XCLocalSwiftPackageReference "../../ExyteChat" */ = { - isa = XCLocalSwiftPackageReference; - relativePath = ../../ExyteChat; - }; -/* End XCLocalSwiftPackageReference section */ - /* Begin XCRemoteSwiftPackageReference section */ 841898A82957712000FEC77D /* XCRemoteSwiftPackageReference "ViewExtractor" */ = { isa = XCRemoteSwiftPackageReference; @@ -4681,6 +4680,14 @@ minimumVersion = 2.0.0; }; }; + 84774DF62D1A939300B15E51 /* XCRemoteSwiftPackageReference "ExyteChat" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/monal-im/ExyteChat"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.5; + }; + }; 849ADF3D2BACF0360009BCD7 /* XCRemoteSwiftPackageReference "cocoalumberjack" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/cocoalumberjack/cocoalumberjack"; @@ -4729,6 +4736,15 @@ isa = XCSwiftPackageProductDependency; productName = ExyteChat; }; + 84774DF42D1A935000B15E51 /* ExyteChat */ = { + isa = XCSwiftPackageProductDependency; + productName = ExyteChat; + }; + 84774DF72D1A939300B15E51 /* ExyteChat */ = { + isa = XCSwiftPackageProductDependency; + package = 84774DF62D1A939300B15E51 /* XCRemoteSwiftPackageReference "ExyteChat" */; + productName = ExyteChat; + }; 849ADF3E2BACF0360009BCD7 /* CocoaLumberjack */ = { isa = XCSwiftPackageProductDependency; package = 849ADF3D2BACF0360009BCD7 /* XCRemoteSwiftPackageReference "cocoalumberjack" */; diff --git a/Monal/Monal.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Monal/Monal.xcworkspace/xcshareddata/swiftpm/Package.resolved index a2f597ace..ea961e63c 100644 --- a/Monal/Monal.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Monal/Monal.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -11,21 +11,21 @@ } }, { - "package": "Chat", - "repositoryURL": "https://github.com/exyte/Chat", + "package": "CocoaLumberjack", + "repositoryURL": "https://github.com/cocoalumberjack/cocoalumberjack", "state": { "branch": null, - "revision": "479b145a3d24ef926c9a3c502fcdc6acbd6f46ea", - "version": "2.0.8" + "revision": "4b8714a7fb84d42393314ce897127b3939885ec3", + "version": "3.8.5" } }, { - "package": "CocoaLumberjack", - "repositoryURL": "https://github.com/cocoalumberjack/cocoalumberjack", + "package": "Chat", + "repositoryURL": "https://github.com/monal-im/ExyteChat", "state": { "branch": null, - "revision": "4b8714a7fb84d42393314ce897127b3939885ec3", - "version": "3.8.5" + "revision": "08394a539ebe69a3f3af8b236fb472a08752b74b", + "version": "2.0.5" } }, {