diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 0c7da8d1b..71c1565af 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -199,6 +199,7 @@ 5B4238D6EB22C0F9D7A2EEC9 /* RoundedToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedToastView.swift; sourceTree = ""; }; 5B9D5F812E5AD6DC786DBC9B /* NavigationRouterStoreProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationRouterStoreProtocol.swift; sourceTree = ""; }; 5CB7F9D6FC121204D59E18DF /* Presentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Presentable.swift; sourceTree = ""; }; + 5D26A086A8278D39B5756D6F /* project.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = project.yml; sourceTree = ""; }; 5F77E8010D41AA3F5F9A1FCA /* NavigationModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationModule.swift; sourceTree = ""; }; 607974D08BD2AF83725D817A /* RoomMessageProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMessageProtocol.swift; sourceTree = ""; }; 61ADFB893DEF81E58DF3FAB9 /* MockRoomTimelineController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockRoomTimelineController.swift; sourceTree = ""; }; @@ -384,6 +385,7 @@ 405B00F139AEE3994601B36A = { isa = PBXGroup; children = ( + 5D26A086A8278D39B5756D6F /* project.yml */, 99B9B46F2D621380428E68F7 /* ElementX */, C0FAC17D4DD7D3A502822550 /* UITests */, A4852B57D55D71EEBFCD931D /* UnitTests */, @@ -1346,8 +1348,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/SwiftyBeaver/SwiftyBeaver"; requirement = { - kind = exactVersion; - version = 1.9.5; + kind = upToNextMajorVersion; + minimumVersion = 1.9.5; }; }; 4FCDA8D25C7415C8FB33490D /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */ = { @@ -1362,32 +1364,32 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess"; requirement = { - branch = master; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 4.2.2; }; }; A24ABD6F9CEE4D0749A6173E /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/siteline/SwiftUI-Introspect.git"; requirement = { - branch = master; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 0.1.4; }; }; C13F55E4518415CB4C278E73 /* XCRemoteSwiftPackageReference "DTCoreText" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Cocoanetics/DTCoreText"; requirement = { - branch = develop; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 1.6.26; }; }; D283517192CAC3E2E6920765 /* XCRemoteSwiftPackageReference "Kingfisher" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/onevcat/Kingfisher"; requirement = { - kind = exactVersion; - version = 7.2.0; + kind = upToNextMajorVersion; + minimumVersion = 7.2.0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b4f5c3d6e..b4b016ee3 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Cocoanetics/DTCoreText", "state" : { - "branch" : "develop", - "revision" : "9f515155c6fcb5d9c39150aa048685aa65b4904f" + "revision" : "b664664825da565b4c2b7a17dbe2369f68ae43d9", + "version" : "1.6.26" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/kishikawakatsumi/KeychainAccess", "state" : { - "branch" : "master", - "revision" : "6299daec1d74be12164fec090faf9ed14d0da9d6" + "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7", + "version" : "4.2.2" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/onevcat/Kingfisher", "state" : { - "revision" : "1a7b5480eb750a8e171654b9b1cb0a2cbeb27a55", - "version" : "7.2.1" + "revision" : "32e4acdf6971f58f5ad552389cf2d7d016334eaf", + "version" : "7.2.0" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/siteline/SwiftUI-Introspect.git", "state" : { - "branch" : "master", - "revision" : "72a509c93166540c0adf8323fd2652daade7f9f6" + "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24", + "version" : "0.1.4" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/SwiftyBeaver/SwiftyBeaver", "state" : { - "revision" : "12b5acf96d98f91d50de447369bd18df74600f1a", - "version" : "1.9.6" + "revision" : "2c039501d6eeb4d4cd4aec4a8d884ad28862e044", + "version" : "1.9.5" } } ], diff --git a/project.yml b/project.yml index 3ea8ebd82..3748d182f 100644 --- a/project.yml +++ b/project.yml @@ -2,6 +2,9 @@ name: ElementX attributes: ORGANIZATIONNAME: element.io +fileGroups: + - project.yml + options: groupSortPosition: bottom createIntermediateGroups: true @@ -17,16 +20,16 @@ packages: branch: main DTCoreText: url: https://github.com/Cocoanetics/DTCoreText - branch: develop + majorVersion: 1.6.26 KeychainAccess: url: https://github.com/kishikawakatsumi/KeychainAccess - branch: master + majorVersion: 4.2.2 Kingfisher: url: https://github.com/onevcat/Kingfisher - exactVersion: 7.2.0 + majorVersion: 7.2.0 Introspect: url: https://github.com/siteline/SwiftUI-Introspect.git - branch: master + majorVersion: 0.1.4 SwiftyBeaver: url: https://github.com/SwiftyBeaver/SwiftyBeaver - exactVersion: 1.9.5 + majorVersion: 1.9.5