ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 12:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Compound. (#3039)

Browse Source 
Remove conflicting Introspect package dependency.
This commit is contained in:
Doug
2024-07-16 09:22:53 +01:00
committed by GitHub
parent 2e6def5157
commit d295a1e4c2
15 changed files with 39 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+2 -11
View File
@@ -5499,7 +5499,6 @@
E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
E2F3DA35D462724CCC61DE2C /* XCRemoteSwiftPackageReference "swift-ogg" */,
6582B5AF3F104B0F7E031E7D /* XCRemoteSwiftPackageReference "SwiftState" */,
9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
EC6D0C817B1C21D9D096505A /* XCRemoteSwiftPackageReference "Version" */,
44FA555384AD79668D886043 /* XCRemoteSwiftPackageReference "matrix-rich-text-editor-swift" */,
);
@@ -7471,14 +7470,6 @@
minimumVersion = 3.2.5;
};
};
9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/siteline/SwiftUI-Introspect";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 1.1.4;
};
};
A08925A9D5E3770DEB9D8509 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/getsentry/sentry-cocoa";
@@ -7548,7 +7539,7 @@
repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 1.16.1;
minimumVersion = 1.17.2;
};
};
EC6D0C817B1C21D9D096505A /* XCRemoteSwiftPackageReference "Version" */ = {
@@ -7564,7 +7555,7 @@
repositoryURL = "https://github.com/element-hq/compound-ios";
requirement = {
kind = revision;
revision = e44f649c9f0c9c562fed3f311aca10c144059725;
revision = 4c682f497b7b1c2ebbe84f564a1cecd2ed201414;
};
};
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+11 -11
View File
@@ -1,13 +1,13 @@
{
"originHash" : "f365b5beb40745f208e5ec7cd4891301b38101ddbeae52296261f3d4a25436c7",
"originHash" : "1b1fb14b1ac1438c44ffd2f0151af65c83018d71b8674cd7f13ec21abeb31bcd",
"pins" : [
{
"identity" : "compound-design-tokens",
"kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-design-tokens",
"state" : {
"revision" : "5086370e2c8d6d23c761369c0ac6c3aef33fc5d6",
"version" : "1.3.0"
"revision" : "5350cf2871ef7edcf043ef57b8990858463db51b",
"version" : "1.6.0"
}
},
{
@@ -15,7 +15,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-ios",
"state" : {
"revision" : "e44f649c9f0c9c562fed3f311aca10c144059725"
"revision" : "4c682f497b7b1c2ebbe84f564a1cecd2ed201414"
}
},
{
@@ -203,8 +203,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SFSafeSymbols/SFSafeSymbols",
"state" : {
"revision" : "afd0a1da4ed62bab1413caa6dd6b60a7a7089ed2",
"version" : "5.2.0"
"revision" : "e2e28f4e56e1769c2ec3c61c9355fc64eb7a535a",
"version" : "5.3.0"
}
},
{
@@ -248,14 +248,14 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-snapshot-testing",
"state" : {
"revision" : "8ddd519780452729c6634ad6bd0d2595938e9ea3",
"version" : "1.16.1"
"revision" : "c097f955b4e724690f0fc8ffb7a6d4b881c9c4e3",
"version" : "1.17.2"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
"version" : "509.0.0"
@@ -275,8 +275,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/siteline/SwiftUI-Introspect",
"state" : {
"revision" : "7dc5b287f8040e4ad5038739850b758e78f77808",
"version" : "1.1.4"
"revision" : "668a65735751432b640260c56dfa621cec568368",
"version" : "1.2.0"
}
},
{
PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen-iPad-en-GB.Edit.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3bf4018eae40dc029d77111eefe587d7d31ec97f01c2c99e178d86fba0319f94
size 120894
oid sha256:4bb8120e7159d365cc5191ae9c68acc7abf119775e5a889978615d1b82c09c48
size 120893
PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen-iPad-pseudo.Edit.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e905d9c36cf7cf5c4c9d05e53b2acf80bcd293b42318e0a7a08c539dcf67a210
size 126565
oid sha256:4f10c4514e20619f8ec2e22722cd8156cdf87a0733c9c7690047e5ec28c0bbb0
size 126581
PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen-iPhone-15-en-GB.Edit.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b965ce3e3eefe1aa98f73fd7091fe99ab1cb31d81e2025019715418bb6d15b58
size 73224
oid sha256:ecb882116531c6f242e2b404263bd709a49abd4ead6038a1a6737c4a4c933ac9
size 73200
PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen-iPhone-15-pseudo.Edit.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5e978b2a2f54e661f653cac5cdb65a62dfa4cb16481a51e807e51df0623fdd1
size 83391
oid sha256:1888bbf6a80158c7dd7c9d31442d7c8a17729184e8a963cf6bb84aa6cd47e13d
size 83368
PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen-iPad-en-GB.Editable.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4c04acbc6defbf78b1ca5615777eb9ee01da4dea8fef0ecd8bed3fbc9e5b5bf
size 106392
oid sha256:7f9c885a46b6f87ddd30839b9b63bcac9fc71c7beedb0435820b78ff21644d4f
size 106377
PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen-iPad-pseudo.Editable.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c25e1efd111d607e42a2e40c100cc25a35c06057efb1cf0713d3ba6573b3ca4
size 114768
oid sha256:6aa010c6deedb6e09653ec182780119823057868410e401a57aa9337e7be2f38
size 114757
PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen-iPhone-15-en-GB.Editable.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb55e0c44b7f6784d0c66bd8362165a1d5b77cbd198e89e457aadf322e03368a
size 57846
oid sha256:14a2586353494254e5603c852a311aa4b49526e34988e0563b0e878b1829975a
size 57815
PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen-iPhone-15-pseudo.Editable.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:653c61c162fa1bea4386c9ed1d4e397709fdb33bd1299326b5cf9685d9fbdc52
size 67402
oid sha256:f2b888f5922264636b23da8bbb3bf3f4319eaed22fa3dbd7d3f3a2a808983444
size 67382
PreviewTests/__Snapshots__/PreviewTests/test_templateScreen-iPad-en-GB.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e869f4c84da22b6a913aac06de6f45fd17005ab27642a1848ae7be9821dd6727
size 90418
oid sha256:eb1619bf0fd7544c5daf486939a475cd9c93d64121c2775ddcd7dad47f5bf3ed
size 90403
PreviewTests/__Snapshots__/PreviewTests/test_templateScreen-iPad-pseudo.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e5b3ebd304276cd122841a341e387ccb82ca7ba4c39bbeba9d2f52de6823470
size 91001
oid sha256:2721c7ae24d35d9ba133c93d53cda51c95507f068e66263c23ca3341dff854b7
size 90986
PreviewTests/__Snapshots__/PreviewTests/test_templateScreen-iPhone-15-en-GB.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:034cab5c3aa5f8b673768327280bde9b3465a0ccaca1edcfba7a9fc6a1234370
size 43973
oid sha256:cfce51f0e1eff07e0c1e3755fbb8e66a8404a4a879f271940afe24d9c4c680d7
size 43949
PreviewTests/__Snapshots__/PreviewTests/test_templateScreen-iPhone-15-pseudo.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37a398b9ffa73911b24aa1167258b2bc92080e0c003daefa00e3ddcf05dacb76
size 44439
oid sha256:e1ce313bebd2c7bba555ba12e5352064de66277be999d674b44babedae641776
size 44417
project.yml
+2 -5
View File
@@ -64,7 +64,7 @@ packages:
# path: ../matrix-rust-sdk
Compound:
url: https://github.com/element-hq/compound-ios
revision: e44f649c9f0c9c562fed3f311aca10c144059725
revision: 4c682f497b7b1c2ebbe84f564a1cecd2ed201414
# path: ../compound-ios
AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events
@@ -130,13 +130,10 @@ packages:
minorVersion: 8.30.0
SnapshotTesting:
url: https://github.com/pointfreeco/swift-snapshot-testing
minorVersion: 1.16.1
minorVersion: 1.17.2
SwiftState:
url: https://github.com/ReactKit/SwiftState
minorVersion: 6.0.0
SwiftUIIntrospect:
url: https://github.com/siteline/SwiftUI-Introspect
minorVersion: 1.1.4
Version:
url: https://github.com/mxcl/Version
minorVersion: 2.0.0