diff --git a/wire-ios-data-model/Resources/Databases Changelog.md b/WireData/Sources/WireData/Schema/Databases Changelog.md similarity index 87% rename from wire-ios-data-model/Resources/Databases Changelog.md rename to WireData/Sources/WireData/Schema/Databases Changelog.md index 8dcc7f611c1..bda8b3e606b 100644 --- a/wire-ios-data-model/Resources/Databases Changelog.md +++ b/WireData/Sources/WireData/Schema/Databases Changelog.md @@ -2,6 +2,12 @@ As it is hard to spot changes from version to version of database models (.xcdatamodeld), here's a changelog highlighting changes per version. +## Special changes + +### Moving of `zmessaging` & `ZMEventModel` to `WireData` SPM target + +* Move `zmessaging` & `ZMEventModel` to `WireData` SPM target while keeping managed object subclasses in `WireDataModel` project target. This is an intermediary state. Eventually all managed object subclasses should be moved to `WireData` target. To achieve this, in **ALL VERSIONS** of `zmessaging` the _Module_ field in the Data Model Inspector was set to `WireDataModel` for non obj-c based entities. The same changes were applied to `ZMEventModel`. These changes did not require a migration. + ## zmessaging ### 2.132.0 diff --git a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/.xccurrentversion b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/.xccurrentversion similarity index 100% rename from wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/.xccurrentversion rename to WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/.xccurrentversion diff --git a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel.xcdatamodel/contents b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel.xcdatamodel/contents similarity index 100% rename from wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel.xcdatamodel/contents diff --git a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel2.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel2.0.xcdatamodel/contents similarity index 100% rename from wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel2.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel2.0.xcdatamodel/contents diff --git a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel3.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel3.0.xcdatamodel/contents similarity index 100% rename from wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel3.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel3.0.xcdatamodel/contents diff --git a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel4.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel4.0.xcdatamodel/contents similarity index 100% rename from wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel4.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel4.0.xcdatamodel/contents diff --git a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel5.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel5.0.xcdatamodel/contents similarity index 100% rename from wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel5.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel5.0.xcdatamodel/contents diff --git a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents index dc7897df3a4..14d9e809f87 100644 --- a/wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents @@ -11,7 +11,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/.xccurrentversion b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/.xccurrentversion similarity index 100% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/.xccurrentversion rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/.xccurrentversion diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents index 983632ae95b..b5240000ed6 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -201,19 +201,19 @@ - + - + - + @@ -241,7 +241,7 @@ - + @@ -306,7 +306,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.101.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.101.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.101.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.101.0.xcdatamodel/contents index bb8b10b9cb8..00813276a61 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.101.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.101.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -193,19 +193,19 @@ - + - + - + @@ -233,7 +233,7 @@ - + @@ -297,7 +297,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.102.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.102.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.102.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.102.0.xcdatamodel/contents index 6910cc9381a..6c43006a244 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.102.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.102.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -193,19 +193,19 @@ - + - + - + @@ -233,7 +233,7 @@ - + @@ -297,7 +297,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.103.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.103.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.103.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.103.0.xcdatamodel/contents index 0f9caeeef48..c5a98089aa6 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.103.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.103.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -102,7 +102,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -194,19 +194,19 @@ - + - + - + @@ -234,7 +234,7 @@ - + @@ -298,7 +298,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.104.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.104.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.104.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.104.0.xcdatamodel/contents index 718471d9f12..248c2b40de4 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.104.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.104.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -104,7 +104,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -196,19 +196,19 @@ - + - + - + @@ -236,7 +236,7 @@ - + @@ -300,7 +300,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.105.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.105.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.105.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.105.0.xcdatamodel/contents index 615aa4391ad..494cbe71059 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.105.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.105.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -106,7 +106,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -198,23 +198,23 @@ - + - + - + - + @@ -242,7 +242,7 @@ - + @@ -306,7 +306,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.106.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.106.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.106.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.106.0.xcdatamodel/contents index e7e43f2b256..bac9625b83d 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.106.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.106.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -107,7 +107,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -199,23 +199,23 @@ - + - + - + - + @@ -243,7 +243,7 @@ - + @@ -307,7 +307,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.107.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.107.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.107.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.107.0.xcdatamodel/contents index 54836bd5f1c..241873f735d 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.107.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.107.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -114,7 +114,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -219,23 +219,23 @@ - + - + - + - + @@ -263,7 +263,7 @@ - + @@ -339,7 +339,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.108.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.108.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.108.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.108.0.xcdatamodel/contents index 48210b50b29..1e5d7322212 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.108.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.108.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -116,7 +116,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -223,23 +223,23 @@ - + - + - + - + @@ -268,7 +268,7 @@ - + @@ -346,7 +346,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.109.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.109.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.109.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.109.0.xcdatamodel/contents index 9897331d3d9..7ea4d4ecaba 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.109.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.109.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -116,7 +116,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -223,24 +223,24 @@ - + - + - + - + @@ -269,7 +269,7 @@ - + @@ -347,7 +347,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.110.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.110.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.110.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.110.0.xcdatamodel/contents index 63be342fcab..7a190646966 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.110.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.110.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -116,7 +116,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -223,24 +223,24 @@ - + - + - + - + @@ -269,7 +269,7 @@ - + @@ -347,7 +347,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.111.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.111.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.111.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.111.0.xcdatamodel/contents index 1ba620f09be..ecd5e75b2c8 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.111.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.111.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -122,7 +122,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -229,24 +229,24 @@ - + - + - + - + @@ -275,7 +275,7 @@ - + @@ -364,7 +364,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.112.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.112.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.112.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.112.0.xcdatamodel/contents index 06f51fe635b..a2bcc0fb685 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.112.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.112.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -122,7 +122,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -229,24 +229,24 @@ - + - + - + - + @@ -275,7 +275,7 @@ - + @@ -364,7 +364,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.113.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.113.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.113.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.113.0.xcdatamodel/contents index 0dfe32f176e..4079eaa1f3a 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.113.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.113.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -122,7 +122,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -229,24 +229,24 @@ - + - + - + - + @@ -275,7 +275,7 @@ - + @@ -364,7 +364,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.114.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.114.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.114.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.114.0.xcdatamodel/contents index 44c889b94bd..814e4f35aa5 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.114.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.114.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -231,24 +231,24 @@ - + - + - + - + @@ -277,7 +277,7 @@ - + @@ -368,7 +368,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.115.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.115.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.115.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.115.0.xcdatamodel/contents index ebfdd343caa..96b286fd0d8 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.115.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.115.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -122,7 +122,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -229,24 +229,24 @@ - + - + - + - + @@ -275,7 +275,7 @@ - + @@ -366,7 +366,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.116.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.116.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.116.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.116.0.xcdatamodel/contents index ed4af788bfb..fec3596384f 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.116.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.116.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -123,7 +123,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -230,24 +230,24 @@ - + - + - + - + @@ -276,7 +276,7 @@ - + @@ -367,7 +367,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.117.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.117.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.117.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.117.0.xcdatamodel/contents index d2dc9359121..c68b28139b2 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.117.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.117.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -231,24 +231,24 @@ - + - + - + - + @@ -277,7 +277,7 @@ - + @@ -368,7 +368,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.118.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.118.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.118.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.118.0.xcdatamodel/contents index 293fd84fd28..db437acdb9f 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.118.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.118.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -232,24 +232,24 @@ - + - + - + - + @@ -278,7 +278,7 @@ - + @@ -369,7 +369,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.119.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.119.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.119.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.119.0.xcdatamodel/contents index d5e758c70bc..05d5b5a537c 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.119.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.119.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -232,24 +232,24 @@ - + - + - + - + @@ -278,7 +278,7 @@ - + @@ -368,7 +368,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.120.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.120.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.120.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.120.0.xcdatamodel/contents index 39f01d53794..660faffc25d 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.120.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.120.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -232,24 +232,24 @@ - + - + - + - + @@ -278,7 +278,7 @@ - + @@ -369,7 +369,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.121.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.121.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.121.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.121.0.xcdatamodel/contents index 1b82c231817..41871f4bb76 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.121.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.121.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -232,24 +232,24 @@ - + - + - + - + @@ -278,7 +278,7 @@ - + @@ -369,7 +369,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.122.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.122.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.122.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.122.0.xcdatamodel/contents index 76a344faaf9..fe4644d23d0 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.122.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.122.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -232,24 +232,24 @@ - + - + - + - + @@ -278,7 +278,7 @@ - + @@ -368,7 +368,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.123.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.123.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.123.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.123.0.xcdatamodel/contents index 006f494dbd9..197fe213f2b 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.123.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.123.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -126,7 +126,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -234,24 +234,24 @@ - + - + - + - + @@ -280,7 +280,7 @@ - + @@ -370,7 +370,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.124.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.124.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.124.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.124.0.xcdatamodel/contents index a2b8982eec3..cc5d218c1e3 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.124.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.124.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -127,7 +127,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -235,24 +235,24 @@ - + - + - + - + @@ -281,7 +281,7 @@ - + @@ -371,7 +371,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.125.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.125.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.125.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.125.0.xcdatamodel/contents index c8a3dd84b70..c4141ebb596 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.125.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.125.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -127,7 +127,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -235,24 +235,24 @@ - + - + - + - + @@ -281,7 +281,7 @@ - + @@ -371,7 +371,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.126.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.126.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.126.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.126.0.xcdatamodel/contents index 9c43c867dfc..75565e01c95 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.126.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.126.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -129,7 +129,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -237,24 +237,24 @@ - + - + - + - + @@ -283,7 +283,7 @@ - + @@ -373,7 +373,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.127.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.127.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.127.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.127.0.xcdatamodel/contents index 16676ff9957..6c6066c99f1 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.127.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.127.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -129,7 +129,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -237,24 +237,24 @@ - + - + - + - + @@ -283,7 +283,7 @@ - + @@ -373,7 +373,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.128.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.128.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.128.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.128.0.xcdatamodel/contents index 8668431f8b8..12bfecea1e4 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.128.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.128.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -129,7 +129,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -237,24 +237,24 @@ - + - + - + - + @@ -283,7 +283,7 @@ - + @@ -373,7 +373,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.129.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.129.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.129.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.129.0.xcdatamodel/contents index 6497832638d..fcbaa73412b 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.129.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.129.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -130,7 +130,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -238,24 +238,24 @@ - + - + - + - + @@ -284,7 +284,7 @@ - + @@ -374,7 +374,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.130.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.130.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.130.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.130.0.xcdatamodel/contents index 4906c39f18f..cee5c529f90 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.130.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.130.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -130,7 +130,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -238,24 +238,24 @@ - + - + - + - + @@ -284,7 +284,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -378,7 +378,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.131.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.131.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.131.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.131.0.xcdatamodel/contents index b12cd052fd1..2f5df787abb 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.131.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.131.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -130,7 +130,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -238,24 +238,24 @@ - + - + - + - + @@ -284,7 +284,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -379,7 +379,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.132.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.132.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.132.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.132.0.xcdatamodel/contents index e406967b54f..89dfca2383d 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.132.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.132.0.xcdatamodel/contents @@ -1,10 +1,10 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -26,13 +26,13 @@ - + - + @@ -130,7 +130,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -242,24 +242,24 @@ - + - + - + - + @@ -288,7 +288,7 @@ - + @@ -313,7 +313,7 @@ - + @@ -383,7 +383,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.80.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.80.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.80.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.80.0.xcdatamodel/contents index 8577ea00a6d..702a7a6291f 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.80.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.80.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -180,19 +180,19 @@ - + - + - + @@ -218,7 +218,7 @@ - + @@ -280,7 +280,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.81.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.81.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.81.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.81.0.xcdatamodel/contents index b43e1a3cc33..faf57def497 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.81.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.81.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -113,7 +113,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -180,19 +180,19 @@ - + - + - + @@ -218,7 +218,7 @@ - + @@ -280,7 +280,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.82.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.82.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.82.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.82.0.xcdatamodel/contents index 0d03d62002b..985f4c7fdd1 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.82.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.82.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -187,19 +187,19 @@ - + - + - + @@ -225,7 +225,7 @@ - + @@ -288,7 +288,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.83.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.83.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.83.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.83.0.xcdatamodel/contents index 9abd72bc827..3e3faebd048 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.83.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.83.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -188,19 +188,19 @@ - + - + - + @@ -226,7 +226,7 @@ - + @@ -289,7 +289,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.84.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.84.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.84.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.84.0.xcdatamodel/contents index 19f9e41667f..1e65a2c17b0 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.84.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.84.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -188,19 +188,19 @@ - + - + - + @@ -226,7 +226,7 @@ - + @@ -289,7 +289,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.85.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.85.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.85.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.85.0.xcdatamodel/contents index eb6d55246c4..2f3f582a29a 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.85.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.85.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -98,7 +98,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -189,19 +189,19 @@ - + - + - + @@ -227,7 +227,7 @@ - + @@ -290,7 +290,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.86.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.86.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.86.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.86.0.xcdatamodel/contents index 77dc4288008..eb18f172139 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.86.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.86.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -98,7 +98,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -189,19 +189,19 @@ - + - + - + @@ -227,7 +227,7 @@ - + @@ -291,7 +291,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.87.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.87.0.xcdatamodel/contents similarity index 97% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.87.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.87.0.xcdatamodel/contents index e38e89d07a5..ce2fd279ee9 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.87.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.87.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -99,7 +99,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -190,19 +190,19 @@ - + - + - + @@ -228,7 +228,7 @@ - + @@ -292,7 +292,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.88.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.88.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.88.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.88.0.xcdatamodel/contents index 7e0002af938..ddd34f9acc6 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.88.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.88.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -199,19 +199,19 @@ - + - + - + @@ -237,7 +237,7 @@ - + @@ -302,7 +302,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.89.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.89.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.89.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.89.0.xcdatamodel/contents index a9419b6d69c..2d611796bfe 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.89.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.89.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -199,19 +199,19 @@ - + - + - + @@ -238,7 +238,7 @@ - + @@ -303,7 +303,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.90.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.90.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.90.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.90.0.xcdatamodel/contents index cdcfef0b5a9..8609c012ad9 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.90.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.90.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -199,19 +199,19 @@ - + - + - + @@ -238,7 +238,7 @@ - + @@ -304,7 +304,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.91.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.91.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.91.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.91.0.xcdatamodel/contents index 443f2eebabc..9397f581c73 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.91.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.91.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -199,19 +199,19 @@ - + - + - + @@ -239,7 +239,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.92.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.92.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.92.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.92.0.xcdatamodel/contents index 337b1037bcb..71cca8d3f3d 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.92.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.92.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -199,19 +199,19 @@ - + - + - + @@ -239,7 +239,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.93.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.93.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.93.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.93.0.xcdatamodel/contents index 73f430c41ed..7e94bed8d52 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.93.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.93.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -99,7 +99,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -198,19 +198,19 @@ - + - + - + @@ -238,7 +238,7 @@ - + @@ -303,7 +303,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.94.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.94.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.94.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.94.0.xcdatamodel/contents index 36818d51457..97c8b93c309 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.94.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.94.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -100,7 +100,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -199,19 +199,19 @@ - + - + - + @@ -239,7 +239,7 @@ - + @@ -304,7 +304,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.95.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.95.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.95.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.95.0.xcdatamodel/contents index 896647fa0f4..d9655c3e6e3 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.95.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.95.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -200,19 +200,19 @@ - + - + - + @@ -240,7 +240,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.96.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.96.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.96.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.96.0.xcdatamodel/contents index bb1ebf98966..44f0513cc95 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.96.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.96.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -200,19 +200,19 @@ - + - + - + @@ -240,7 +240,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.97.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.97.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.97.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.97.0.xcdatamodel/contents index 3c86d991e6c..f59e14a3838 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.97.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.97.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -200,19 +200,19 @@ - + - + - + @@ -240,7 +240,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.98.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.98.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.98.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.98.0.xcdatamodel/contents index 7463d5f2c5c..5d420382870 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.98.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.98.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -201,19 +201,19 @@ - + - + - + @@ -241,7 +241,7 @@ - + @@ -306,7 +306,7 @@ - + diff --git a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.99.0.xcdatamodel/contents b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.99.0.xcdatamodel/contents similarity index 96% rename from wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.99.0.xcdatamodel/contents rename to WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.99.0.xcdatamodel/contents index 6e6e9c82544..f3b044c1e4d 100644 --- a/wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.99.0.xcdatamodel/contents +++ b/WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.99.0.xcdatamodel/contents @@ -1,15 +1,15 @@ - + - + - + @@ -23,13 +23,13 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -201,19 +201,19 @@ - + - + - + @@ -241,7 +241,7 @@ - + @@ -306,7 +306,7 @@ - + diff --git a/wire-ios-data-model/Source/Utilis/WireDataModelBundle.swift b/WireData/Sources/WireData/WireDataBundle.swift similarity index 88% rename from wire-ios-data-model/Source/Utilis/WireDataModelBundle.swift rename to WireData/Sources/WireData/WireDataBundle.swift index 7de2e208e30..0dbcadf31da 100644 --- a/wire-ios-data-model/Source/Utilis/WireDataModelBundle.swift +++ b/WireData/Sources/WireData/WireDataBundle.swift @@ -18,6 +18,6 @@ import Foundation -final class WireDataModelBundle { - static let bundle = Bundle(for: WireDataModelBundle.self) +public enum WireDataBundle { + public static let bundle = Bundle.module } diff --git a/wire-ios-data-model/Tests/Source/Model/WireCellsLocalAsset/WireCellsLocalAssetTests.swift b/WireData/Tests/WireDataTests/Models/WireCellsLocalAssetTests.swift similarity index 63% rename from wire-ios-data-model/Tests/Source/Model/WireCellsLocalAsset/WireCellsLocalAssetTests.swift rename to WireData/Tests/WireDataTests/Models/WireCellsLocalAssetTests.swift index 4e3b35e673f..6bf1610cc4a 100644 --- a/wire-ios-data-model/Tests/Source/Model/WireCellsLocalAsset/WireCellsLocalAssetTests.swift +++ b/WireData/Tests/WireDataTests/Models/WireCellsLocalAssetTests.swift @@ -16,25 +16,24 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +import CoreData import Testing -import WireData -import WireDataModelSupport -@testable import WireDataModel +@testable import WireData @MainActor struct WireCellsLocalAssetTests { - private let coreDataStack: CoreDataStack + private let container: NSPersistentContainer - init() async throws { - self.coreDataStack = try await CoreDataStackHelper().createStack() + init() throws { + self.container = try NSPersistentContainer.inMemoryContainer() } @Test func initialization() async throws { // given - let context = coreDataStack.viewContext + let context = container.viewContext let nodeID = UUID() let asset = WireCellsLocalAsset(context: context) @@ -61,3 +60,26 @@ struct WireCellsLocalAssetTests { } } + +// MARK: - Helpers + +private extension NSPersistentContainer { + + static func inMemoryContainer() throws -> NSPersistentContainer { + let model = NSManagedObjectModel.mergedModel(from: [WireDataBundle.bundle]) + + let description = NSPersistentStoreDescription() + description.type = NSInMemoryStoreType + let container = NSPersistentContainer(name: "zmessaging", managedObjectModel: model!) + container.persistentStoreDescriptions = [description] + var loadError: Error? + container.loadPersistentStores { _, error in + loadError = error + } + if let loadError { + throw loadError + } + return container + } + +} diff --git a/WireDomain/Tests/TestHost/WireDomainTestHostApp.swift b/WireDomain/Tests/TestHost/WireDomainTestHostApp.swift new file mode 100644 index 00000000000..965e19b1ddc --- /dev/null +++ b/WireDomain/Tests/TestHost/WireDomainTestHostApp.swift @@ -0,0 +1,28 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import SwiftUI + +@main +struct WireDomainTestHostApp: App { + var body: some Scene { + WindowGroup { + Text("Test host for WireDomain") + } + } +} diff --git a/WireDomain/Tests/WireDomainTests/Event Decryption/UpdateEventDecryptorTests.swift b/WireDomain/Tests/WireDomainTests/Event Decryption/UpdateEventDecryptorTests.swift index e75de5ffe51..9b6084c0b94 100644 --- a/WireDomain/Tests/WireDomainTests/Event Decryption/UpdateEventDecryptorTests.swift +++ b/WireDomain/Tests/WireDomainTests/Event Decryption/UpdateEventDecryptorTests.swift @@ -201,7 +201,8 @@ final class UpdateEventDecryptorTests: XCTestCase { ] ) - await Task.yield() + // Hack to allow `commitPendingProposalsIfNeeded` to complete :( + await Task(priority: .low) { await Task.yield() }.value XCTAssertEqual(mlsService.commitPendingProposalsIfNeeded_Invocations.count, 1) } diff --git a/WireDomain/WireDomain Project.xcodeproj/project.pbxproj b/WireDomain/WireDomain Project.xcodeproj/project.pbxproj index c341a00794f..bfe35f87447 100644 --- a/WireDomain/WireDomain Project.xcodeproj/project.pbxproj +++ b/WireDomain/WireDomain Project.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ C9E0C9BB2C91B76F00CE6607 /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = C9E0C9BA2C91B76F00CE6607 /* WireTestingPackage */; }; CB6343F02DB7EF3D00A1C892 /* WireUpdateEventCoding in Frameworks */ = {isa = PBXBuildFile; productRef = CB6343EF2DB7EF3D00A1C892 /* WireUpdateEventCoding */; }; CB7979132C738508006FBA58 /* WireTransportSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7979122C738508006FBA58 /* WireTransportSupport.framework */; }; + CBC41E722EB51569000769CE /* WireDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -50,6 +51,20 @@ remoteGlobalIDString = 017F67812C207A3200B6E02D; remoteInfo = WireDomainSupport; }; + CBC41E702EB5155D000769CE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 01D0DC9D2C1C8C870076CB1C /* Project object */; + proxyType = 1; + remoteGlobalIDString = CBC41E642EB514F2000769CE; + remoteInfo = WireDomainTestHost; + }; + CBC41E742EB51569000769CE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 01D0DC9D2C1C8C870076CB1C /* Project object */; + proxyType = 1; + remoteGlobalIDString = 01D0DCA52C1C8C870076CB1C; + remoteInfo = WireDomain; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -60,6 +75,7 @@ 01D0DCC32C1C8CC20076CB1C /* WireDataModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModel.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 01D0DCC52C1C8CD90076CB1C /* WireTransport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTransport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CB7979122C738508006FBA58 /* WireTransportSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTransportSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CBC41E652EB514F2000769CE /* WireDomainTestHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WireDomainTestHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -78,6 +94,7 @@ 59EA78992D00CF1C002CA0B8 /* WireDomainTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireDomainTests; sourceTree = ""; }; 59EA78D42D00CF22002CA0B8 /* WireDomainSupport */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (595594652DD64BA90084CF2A /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = WireDomainSupport; sourceTree = ""; }; 59EA7A282D00CFB2002CA0B8 /* WireDomain */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireDomain; sourceTree = ""; }; + CBC41E662EB514F2000769CE /* TestHost */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = TestHost; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ @@ -121,6 +138,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CBC41E622EB514F2000769CE /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + CBC41E722EB51569000769CE /* WireDomain.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -139,6 +164,7 @@ 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */, 01D0DCB02C1C8C880076CB1C /* WireDomainTests.xctest */, 017F67822C207A3200B6E02D /* WireDomainSupport.framework */, + CBC41E652EB514F2000769CE /* WireDomainTestHost.app */, ); name = Products; sourceTree = ""; @@ -167,6 +193,7 @@ 01D0DCED2C1C8EA10076CB1C /* Tests */ = { isa = PBXGroup; children = ( + CBC41E662EB514F2000769CE /* TestHost */, 5904B7822D315AAC00E866D1 /* TestPlans */, 59EA78992D00CF1C002CA0B8 /* WireDomainTests */, ); @@ -245,6 +272,7 @@ dependencies = ( 01D0DCB32C1C8C880076CB1C /* PBXTargetDependency */, 5904B1B62D31582700E866D1 /* PBXTargetDependency */, + CBC41E712EB5155D000769CE /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( 5904B7822D315AAC00E866D1 /* TestPlans */, @@ -259,6 +287,29 @@ productReference = 01D0DCB02C1C8C880076CB1C /* WireDomainTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + CBC41E642EB514F2000769CE /* WireDomainTestHost */ = { + isa = PBXNativeTarget; + buildConfigurationList = CBC41E6F2EB514F4000769CE /* Build configuration list for PBXNativeTarget "WireDomainTestHost" */; + buildPhases = ( + CBC41E612EB514F2000769CE /* Sources */, + CBC41E622EB514F2000769CE /* Frameworks */, + CBC41E632EB514F2000769CE /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + CBC41E752EB51569000769CE /* PBXTargetDependency */, + ); + fileSystemSynchronizedGroups = ( + CBC41E662EB514F2000769CE /* TestHost */, + ); + name = WireDomainTestHost; + packageProductDependencies = ( + ); + productName = WireDomainTestHost; + productReference = CBC41E652EB514F2000769CE /* WireDomainTestHost.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -266,7 +317,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = 1; - LastSwiftUpdateCheck = 1530; + LastSwiftUpdateCheck = 2600; LastUpgradeCheck = 1540; TargetAttributes = { 017F67812C207A3200B6E02D = { @@ -277,6 +328,10 @@ }; 01D0DCAF2C1C8C880076CB1C = { CreatedOnToolsVersion = 15.3; + TestTargetID = CBC41E642EB514F2000769CE; + }; + CBC41E642EB514F2000769CE = { + CreatedOnToolsVersion = 26.0.1; }; }; }; @@ -317,6 +372,7 @@ targets = ( 01D0DCA52C1C8C870076CB1C /* WireDomain */, 01D0DCAF2C1C8C880076CB1C /* WireDomainTests */, + CBC41E642EB514F2000769CE /* WireDomainTestHost */, 017F67812C207A3200B6E02D /* WireDomainSupport */, ); }; @@ -344,6 +400,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CBC41E632EB514F2000769CE /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -390,6 +453,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CBC41E612EB514F2000769CE /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -408,6 +478,16 @@ target = 017F67812C207A3200B6E02D /* WireDomainSupport */; targetProxy = 5904B1B52D31582700E866D1 /* PBXContainerItemProxy */; }; + CBC41E712EB5155D000769CE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = CBC41E642EB514F2000769CE /* WireDomainTestHost */; + targetProxy = CBC41E702EB5155D000769CE /* PBXContainerItemProxy */; + }; + CBC41E752EB51569000769CE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 01D0DCA52C1C8C870076CB1C /* WireDomain */; + targetProxy = CBC41E742EB51569000769CE /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -705,6 +785,7 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WireDomainTestHost.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/WireDomainTestHost"; }; name = Debug; }; @@ -725,6 +806,75 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WireDomainTestHost.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/WireDomainTestHost"; + }; + name = Release; + }; + CBC41E6D2EB514F4000769CE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = EDF3JCE8BC; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.wire.WireDomainTestHost; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + CBC41E6E2EB514F4000769CE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = EDF3JCE8BC; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.wire.WireDomainTestHost; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; @@ -767,6 +917,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + CBC41E6F2EB514F4000769CE /* Build configuration list for PBXNativeTarget "WireDomainTestHost" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CBC41E6D2EB514F4000769CE /* Debug */, + CBC41E6E2EB514F4000769CE /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ diff --git a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift index 424f5e2b469..a0218f0e2cd 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift @@ -180,8 +180,14 @@ public class CoreDataStack: NSObject, CoreDataStackProtocol { self.accountContainer = accountDirectory - let eventContainer = PersistentContainer(name: "ZMEventModel") - let messagesContainer = PersistentContainer(name: "zmessaging") + let eventContainer = PersistentContainer( + name: "ZMEventModel", + managedObjectModel: CoreDataStack.loadEventsModel() + ) + let messagesContainer = PersistentContainer( + name: "zmessaging", + managedObjectModel: CoreDataStack.loadMessagingModel() + ) let description: NSPersistentStoreDescription let eventStoreDescription: NSPersistentStoreDescription @@ -445,7 +451,7 @@ public class CoreDataStack: NSObject, CoreDataStackProtocol { } public static func loadMessagingModel() -> NSManagedObjectModel { - let modelBundle = Bundle(for: ZMManagedObject.self) + let modelBundle = WireDataBundle.bundle guard let result = NSManagedObjectModel( contentsOf: modelBundle.bundleURL @@ -458,7 +464,7 @@ public class CoreDataStack: NSObject, CoreDataStackProtocol { } public static func loadEventsModel() -> NSManagedObjectModel { - let modelBundle = WireDataModelBundle.bundle + let modelBundle = WireDataBundle.bundle guard let result = NSManagedObjectModel( contentsOf: modelBundle.bundleURL diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataEventsMigrationVersion.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataEventsMigrationVersion.swift index be09edce527..062ba33015c 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataEventsMigrationVersion.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataEventsMigrationVersion.swift @@ -17,6 +17,7 @@ // import Foundation +import WireData enum CoreDataEventsMigrationVersion: String, CoreDataMigrationVersion { @@ -64,7 +65,7 @@ enum CoreDataEventsMigrationVersion: String, CoreDataMigrationVersion { // MARK: Store URL func managedObjectModelURL() -> URL? { - WireDataModelBundle.bundle.url( + WireDataBundle.bundle.url( forResource: rawValue, withExtension: Constant.resourceExtension, subdirectory: Constant.modelDirectory diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMessagingMigrationVersion.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMessagingMigrationVersion.swift index ea298f7a650..318e6584a85 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMessagingMigrationVersion.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMessagingMigrationVersion.swift @@ -17,6 +17,7 @@ // import Foundation +import WireData enum CoreDataMessagingMigrationVersion: String, CoreDataMigrationVersion { @@ -167,7 +168,7 @@ enum CoreDataMessagingMigrationVersion: String, CoreDataMigrationVersion { // MARK: Store URL func managedObjectModelURL() -> URL? { - WireDataModelBundle.bundle.url( + WireDataBundle.bundle.url( forResource: rawValue, withExtension: Constant.resourceExtension, subdirectory: Constant.modelDirectory diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrationStep.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrationStep.swift index 94e05e1f6a2..6fa334b6085 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrationStep.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrationStep.swift @@ -17,6 +17,7 @@ // import CoreData +import WireData struct CoreDataMigrationStep { @@ -82,7 +83,7 @@ struct CoreDataMigrationStep { toDestinationModel destinationModel: NSManagedObjectModel ) -> NSMappingModel? { NSMappingModel( - from: [WireDataModelBundle.bundle], + from: [WireDataBundle.bundle], forSourceModel: sourceModel, destinationModel: destinationModel ) diff --git a/wire-ios-data-model/Tests/SchemaTests/SchemaTests.swift b/wire-ios-data-model/Tests/SchemaTests/SchemaTests.swift new file mode 100644 index 00000000000..90dbd57174b --- /dev/null +++ b/wire-ios-data-model/Tests/SchemaTests/SchemaTests.swift @@ -0,0 +1,53 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import Testing + +@testable import WireDataModel + +struct SchemaTests { + + let stack = CoreDataStack( + account: Account(userName: "", userIdentifier: UUID()), + applicationContainer: .temporaryDirectory, + inMemoryStore: true, + localDomain: "wire.com", + isFederationEnabled: false + ) + + init() async throws { + try await stack.load() + } + + @Test + func everyManagedObjectSubclassesCanBeInitiated() async throws { + let entities = stack.messagesContainer.managedObjectModel.entities + let context = stack.viewContext + + try await context.perform { + for entity in entities { + let cls = try #require( + NSClassFromString(entity.managedObjectClassName) as? NSManagedObject.Type, + "Could not find class for entity \(entity.managedObjectClassName!)" + ) + _ = cls.init(context: stack.viewContext) + } + } + } + +} diff --git a/wire-ios-data-model/Tests/Source/Helper/DatabaseMigrationHelper.swift b/wire-ios-data-model/Tests/Source/Helper/DatabaseMigrationHelper.swift index cf28542997f..f9bcbca69d3 100644 --- a/wire-ios-data-model/Tests/Source/Helper/DatabaseMigrationHelper.swift +++ b/wire-ios-data-model/Tests/Source/Helper/DatabaseMigrationHelper.swift @@ -16,6 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +import WireData import XCTest @testable import WireDataModel @@ -48,7 +49,7 @@ struct DatabaseMigrationHelper { typealias MigrationAction = (NSManagedObjectContext) throws -> Void - private let bundle = WireDataModelBundle.bundle + private let bundle = WireDataBundle.bundle private let dataModelName = "zmessaging" func createObjectModel(version: String) throws -> NSManagedObjectModel { diff --git a/wire-ios-data-model/Tests/Source/ManagedObjectContext/DatabaseMigrationTests.swift b/wire-ios-data-model/Tests/Source/ManagedObjectContext/DatabaseMigrationTests.swift index df9beac702b..c074b05dc6c 100644 --- a/wire-ios-data-model/Tests/Source/ManagedObjectContext/DatabaseMigrationTests.swift +++ b/wire-ios-data-model/Tests/Source/ManagedObjectContext/DatabaseMigrationTests.swift @@ -17,6 +17,7 @@ // // +import WireData import XCTest @testable import WireDataModel @@ -193,7 +194,7 @@ final class DatabaseMigrationTests: DatabaseBaseTest { func testThatTheVersionIdentifiersMatchModelNameAndDoNotDuplicate() throws { // given - guard let source = Bundle(for: ZMMessage.self).url(forResource: "zmessaging", withExtension: "momd") else { + guard let source = WireDataBundle.bundle.url(forResource: "zmessaging", withExtension: "momd") else { fatalError("missing resource") } let fm = FileManager.default diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index 313b9cc73b6..17b6e05a316 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -24,7 +24,6 @@ 0153CA932B8554EC000000CA /* store2-113-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 0153CA8F2B855456000000CA /* store2-113-0.wiredatabase */; }; 01586D422CAED03900C3BCE1 /* FixDuplicateOneOnOneConversationsAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01586D402CAED03900C3BCE1 /* FixDuplicateOneOnOneConversationsAction.swift */; }; 01586D442CAED2B200C3BCE1 /* store2-119-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 01586D432CAED2B200C3BCE1 /* store2-119-0.wiredatabase */; }; - 0158DF212C594B3600C7BFFD /* ZMEventModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0158DF1A2C594B1600C7BFFD /* ZMEventModel.xcdatamodeld */; }; 0158DF232C5A3C6700C7BFFD /* event_4.0.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = 0158DF222C5A3C6600C7BFFD /* event_4.0.sqlite */; }; 016D293A2C10FB2F00DB969A /* ZMMessageTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 016D29392C10FB2F00DB969A /* ZMMessageTimer.swift */; }; 0176B8812E7AE25B005D448B /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 0176B8802E7AE25B005D448B /* WireLogging */; }; @@ -475,7 +474,6 @@ E6A239902B7F6F50004E48C2 /* MockActorOneOnOneMigrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A2398F2B7F6F50004E48C2 /* MockActorOneOnOneMigrator.swift */; }; E6A239932B7F6F82004E48C2 /* MockActorOneOnOneProtocolSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A239922B7F6F82004E48C2 /* MockActorOneOnOneProtocolSelector.swift */; }; E6A5BBA62B0E33DB00ACC236 /* CoreDataMessagingMigrationVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A5BBA52B0E33DB00ACC236 /* CoreDataMessagingMigrationVersion.swift */; }; - E6A5BBAE2B0E564200ACC236 /* WireDataModelBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A5BBAD2B0E564200ACC236 /* WireDataModelBundle.swift */; }; E6BB79592C36EBE0003B821B /* store2-118-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = E6BB79582C36EBE0003B821B /* store2-118-0.wiredatabase */; }; E6BDA1152B1642A400488D92 /* store2-110-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = E6BDA1142B1642A400488D92 /* store2-110-0.wiredatabase */; }; E6BFE8382B3320C7000F0FBE /* DatabaseMigrationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BFE8372B3320C7000F0FBE /* DatabaseMigrationHelper.swift */; }; @@ -501,7 +499,6 @@ E6E5044C2BC56EA0004948E7 /* EARServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6E5044A2BC56EA0004948E7 /* EARServiceTests.swift */; }; E6E5044E2BC56EDE004948E7 /* LAContextStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6E5044D2BC56EDE004948E7 /* LAContextStorageTests.swift */; }; E6E504502BC571BF004948E7 /* AuthenticationContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6E5044F2BC571BF004948E7 /* AuthenticationContextTests.swift */; }; - E6F443232B16294400D2B08A /* zmessaging.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E6F443042B16294000D2B08A /* zmessaging.xcdatamodeld */; }; E90AAE34279719D8003C7DB0 /* store2-98-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = E90AAE33279719D8003C7DB0 /* store2-98-0.wiredatabase */; }; E9C7DD9B27B533D000FB9AE8 /* AccessRoleMappingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C7DD9A27B533D000FB9AE8 /* AccessRoleMappingTests.swift */; }; EE002F222878345C0027D63A /* store2-104-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = EE002F212878345C0027D63A /* store2-104-0.wiredatabase */; }; @@ -782,42 +779,27 @@ 013887A92B9A5C8B00323DD0 /* CoreDataMigrationActionFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataMigrationActionFactory.swift; sourceTree = ""; }; 013887AA2B9A5C8B00323DD0 /* CoreDataMigrationAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataMigrationAction.swift; sourceTree = ""; }; 013887AD2B9A5CA800323DD0 /* CoreDataMigrationActionFactoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataMigrationActionFactoryTests.swift; sourceTree = ""; }; - 01423BC72DB00D8200C49567 /* zmessaging2.125.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.125.0.xcdatamodel; sourceTree = ""; }; 01423BC82DB013DF00C49567 /* store2-125-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-125-0.wiredatabase"; sourceTree = ""; }; 014DD8D22B6D1FE9007ECFD1 /* UUID+SafeLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UUID+SafeLogging.swift"; sourceTree = ""; }; - 0153CA842B8540F0000000CA /* zmessaging2.114.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.114.0.xcdatamodel; sourceTree = ""; }; 0153CA8F2B855456000000CA /* store2-113-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-113-0.wiredatabase"; sourceTree = ""; }; - 01586D3F2CAECE8B00C3BCE1 /* zmessaging2.119.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.119.0.xcdatamodel; sourceTree = ""; }; 01586D402CAED03900C3BCE1 /* FixDuplicateOneOnOneConversationsAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FixDuplicateOneOnOneConversationsAction.swift; sourceTree = ""; }; 01586D432CAED2B200C3BCE1 /* store2-119-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-119-0.wiredatabase"; sourceTree = ""; }; - 0158DF1B2C594B1600C7BFFD /* ZMEventModel5.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel5.0.xcdatamodel; sourceTree = ""; }; - 0158DF1C2C594B1600C7BFFD /* ZMEventModel6.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel6.0.xcdatamodel; sourceTree = ""; }; - 0158DF1D2C594B1600C7BFFD /* ZMEventModel2.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel2.0.xcdatamodel; sourceTree = ""; }; - 0158DF1E2C594B1600C7BFFD /* ZMEventModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel.xcdatamodel; sourceTree = ""; }; - 0158DF1F2C594B1600C7BFFD /* ZMEventModel3.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel3.0.xcdatamodel; sourceTree = ""; }; - 0158DF202C594B1600C7BFFD /* ZMEventModel4.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel4.0.xcdatamodel; sourceTree = ""; }; 0158DF222C5A3C6600C7BFFD /* event_4.0.sqlite */ = {isa = PBXFileReference; lastKnownFileType = file; path = event_4.0.sqlite; sourceTree = ""; }; 016D29392C10FB2F00DB969A /* ZMMessageTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMMessageTimer.swift; sourceTree = ""; }; - 0176BDCF2D515224002C33DE /* zmessaging2.122.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.122.0.xcdatamodel; sourceTree = ""; }; 0176BDD02D515764002C33DE /* store2-122-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-122-0.wiredatabase"; sourceTree = ""; }; 017962952B83FC1400D6C7B6 /* DatabaseMigrationTests+UserUniqueness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+UserUniqueness.swift"; sourceTree = ""; }; 017962962B83FC1400D6C7B6 /* DatabaseMigrationTests+TeamUniqueness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+TeamUniqueness.swift"; sourceTree = ""; }; 017962972B83FC1400D6C7B6 /* DatabaseMigrationTests+ConversationUniqueness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+ConversationUniqueness.swift"; sourceTree = ""; }; 0179629B2B83FCA800D6C7B6 /* NSManagedObjectContext+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Migration.swift"; sourceTree = ""; }; 017962A72B85071B00D6C7B6 /* store2-112-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-112-0.wiredatabase"; sourceTree = ""; }; - 017962AB2B853C8600D6C7B6 /* Databases Changelog.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = "Databases Changelog.md"; sourceTree = ""; }; 0179BC812BA9D08300A6C493 /* DatabaseRemoteIdentifierUniquenessTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseRemoteIdentifierUniquenessTests.swift; sourceTree = ""; }; - 017B55732CFFA599005FFBD4 /* zmessaging2.120.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.120.0.xcdatamodel; sourceTree = ""; }; 017B55752CFFA6B8005FFBD4 /* ForceSyncResourcesPostAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForceSyncResourcesPostAction.swift; sourceTree = ""; }; 017B55782CFFB560005FFBD4 /* NSManagedObjectContext+SyncResources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+SyncResources.swift"; sourceTree = ""; }; 017B557C2CFFBCF5005FFBD4 /* DatabaseMigrationTests+ForceSyncResources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+ForceSyncResources.swift"; sourceTree = ""; }; 017B55A82CFFC310005FFBD4 /* store2-120-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-120-0.wiredatabase"; sourceTree = ""; }; 0189815429A66B0800B52510 /* SafeCoreCryptoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafeCoreCryptoTests.swift; sourceTree = ""; }; - 01943A0B2E01A11C0005CD1E /* zmessaging2.127.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.127.0.xcdatamodel; sourceTree = ""; }; 01943A0C2E01A9B50005CD1E /* store2-127-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-127-0.wiredatabase"; sourceTree = ""; }; - 01A4709E2DAD4A1D00B1B2E7 /* zmessaging2.124.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.124.0.xcdatamodel; sourceTree = ""; }; 01A4709F2DAD6F0C00B1B2E7 /* store2-124-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-124-0.wiredatabase"; sourceTree = ""; }; - 01B6A89E2B16252300E409A0 /* zmessaging2.111.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.111.0.xcdatamodel; sourceTree = ""; }; 01B6A89F2B16268300E409A0 /* store2-111-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-111-0.wiredatabase"; sourceTree = ""; }; 01B7A5742B0FB6DA00FE5132 /* CoreDataMessagingMigrationVersionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CoreDataMessagingMigrationVersionTests.swift; path = Migrations/CoreDataMessagingMigrationVersionTests.swift; sourceTree = ""; }; 01BDA3122C59210300675DCB /* CoreDataMessagingMigratorProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataMessagingMigratorProtocol.swift; sourceTree = ""; }; @@ -885,7 +867,6 @@ 1600D943267BC5A000970F99 /* ZMManagedObjectFetchingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMManagedObjectFetchingTests.swift; sourceTree = ""; }; 16030DBD21AE8FAB00F8032E /* ZMConversationTests+Confirmations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+Confirmations.swift"; sourceTree = ""; }; 16030DC421AEE25500F8032E /* ZMOTRMessage+Confirmations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMOTRMessage+Confirmations.swift"; sourceTree = ""; }; - 16058B262BDA8987003C82C2 /* zmessaging2.117.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.117.0.xcdatamodel; sourceTree = ""; }; 16058B292BDA9D27003C82C2 /* MLSCiphersuite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSCiphersuite.swift; sourceTree = ""; }; 16058B2B2BDA9D83003C82C2 /* MLSSignatureAlgorithm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSSignatureAlgorithm.swift; sourceTree = ""; }; 16058B2D2BDBAF73003C82C2 /* store2-117-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-117-0.wiredatabase"; sourceTree = ""; }; @@ -893,7 +874,6 @@ 161E05692667C4D000DADC3D /* AccountDeletedObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletedObserver.swift; sourceTree = ""; }; 1621E59120E62BD2006B2D17 /* ZMConversationTests+Silencing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+Silencing.swift"; sourceTree = ""; }; 162294A4222038FA00A98679 /* CacheAssetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheAssetTests.swift; sourceTree = ""; }; - 162F85A62BC586A3007E2CB6 /* zmessaging2.116.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.116.0.xcdatamodel; sourceTree = ""; }; 162F85A82BC588A5007E2CB6 /* IsPendingInitialFetchMigrationAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IsPendingInitialFetchMigrationAction.swift; sourceTree = ""; }; 162F85AA2BC58DF8007E2CB6 /* store2-116-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-116-0.wiredatabase"; sourceTree = ""; }; 162F85AD2BC58FF7007E2CB6 /* DatabaseMigrationTests+IsPendingIntitialFetch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+IsPendingIntitialFetch.swift"; sourceTree = ""; }; @@ -964,7 +944,6 @@ 16E70F97270F1F5700718E5D /* ZMConnection+Helper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ZMConnection+Helper.h"; sourceTree = ""; }; 16E70FA6270F212000718E5D /* ZMConnection+Helper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ZMConnection+Helper.m"; sourceTree = ""; }; 16E7DA291FDABE440065B6A6 /* ZMOTRMessage+SelfConversationUpdateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMOTRMessage+SelfConversationUpdateTests.swift"; sourceTree = ""; }; - 16EFC3AC2BAB1FFE0046C1D7 /* zmessaging2.115.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.115.0.xcdatamodel; sourceTree = ""; }; 16EFC3AD2BAB8AF20046C1D7 /* store2-114-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-114-0.wiredatabase"; sourceTree = ""; }; 16EFC3AF2BAB8B910046C1D7 /* store2-115-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-115-0.wiredatabase"; sourceTree = ""; }; 16F7341024F9556600AB93B1 /* ZMConversationTests+DraftMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+DraftMessage.swift"; sourceTree = ""; }; @@ -1015,13 +994,11 @@ 54FB03AE1E41FC86000E13DC /* NSManagedObjectContext+Patches.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Patches.swift"; sourceTree = ""; }; 55C40BD422B0F75C00EFD8BD /* ZMUserLegalHoldTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMUserLegalHoldTests.swift; sourceTree = ""; }; 590407092C258C810009542C /* ConversationList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationList.swift; sourceTree = ""; }; - 59085C5C2E8569D800882DD1 /* zmessaging2.130.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.130.0.xcdatamodel; sourceTree = ""; }; 591362E52B70F45C000B210C /* MLSVerificationStatusTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSVerificationStatusTests.swift; sourceTree = ""; }; 591942B52B6A4B4D0000B390 /* UserObserving.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserObserving.swift; sourceTree = ""; }; 591F8A012B8CB4DE00D562A6 /* IsSelfUserE2EICertifiedUseCaseProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsSelfUserE2EICertifiedUseCaseProtocol.swift; sourceTree = ""; }; 591F8A032B8CB4EF00D562A6 /* IsSelfUserE2EICertifiedUseCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsSelfUserE2EICertifiedUseCase.swift; sourceTree = ""; }; 591F8A052B8CB81400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsSelfUserE2EICertifiedUseCaseTests.swift; sourceTree = ""; }; - 5930D9C22D43BC33009E3514 /* zmessaging2.121.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.121.0.xcdatamodel; sourceTree = ""; }; 5947923C2EA7A576006BEC0A /* store2-131-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-131-0.wiredatabase"; sourceTree = ""; }; 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalization.swift; sourceTree = ""; }; 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalizer.swift; sourceTree = ""; }; @@ -1033,7 +1010,6 @@ 5986A08C2C6B710E00299181 /* TextMessageData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextMessageData.swift; sourceTree = ""; }; 5986A08E2C6B744300299181 /* TextMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextMessage.swift; sourceTree = ""; }; 5987962F2B45880400A6FC63 /* ZMUpdateEvent+allTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMUpdateEvent+allTypes.swift"; sourceTree = ""; }; - 599033E02EA79C740046D3C3 /* zmessaging2.131.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.131.0.xcdatamodel; sourceTree = ""; }; 5996E8C62C1A0000007A52F0 /* OCMock.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OCMock.xcframework; path = ../Carthage/Build/OCMock.xcframework; sourceTree = ""; }; 599EA3CF2C246886009319D4 /* FilterConversationsUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterConversationsUseCase.swift; sourceTree = ""; }; 599EA3D22C2468A0009319D4 /* FilterConversationsUseCase Protocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FilterConversationsUseCase Protocol.swift"; sourceTree = ""; }; @@ -1088,7 +1064,6 @@ 638941F52AF5211D0051ABFD /* RemoveLocalConversationUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveLocalConversationUseCaseTests.swift; sourceTree = ""; }; 6391A7FB2A6FD7C900832665 /* DatabaseMigrationTests+UserClientUniqueness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+UserClientUniqueness.swift"; sourceTree = ""; }; 6391A7FE2A6FDB9100832665 /* store2-107-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-107-0.wiredatabase"; sourceTree = ""; }; - 6398545E2B346A0700AA10DE /* zmessaging2.112.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.112.0.xcdatamodel; sourceTree = ""; }; 639971A92B1E301E009DD5CF /* ReplaceSelfMLSKeyPackagesAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplaceSelfMLSKeyPackagesAction.swift; sourceTree = ""; }; 63AFE2D5244F49A90003F619 /* GenericMessage+MessageCapable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+MessageCapable.swift"; sourceTree = ""; }; 63B1333729A503D000009D84 /* ProteusServiceInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusServiceInterface.swift; sourceTree = ""; }; @@ -1204,7 +1179,6 @@ BFE764421ED5AAE400C65C3E /* ZMConversation+TeamsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMConversation+TeamsTests.swift"; sourceTree = ""; }; BFFBFD921D59E3F00079773E /* ConversationMessage+Deletion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConversationMessage+Deletion.swift"; sourceTree = ""; }; BFFBFD941D59E49D0079773E /* ZMClientMessageTests+Deletion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMClientMessageTests+Deletion.swift"; sourceTree = ""; }; - C9B8074D2E605B3100183723 /* zmessaging2.129.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.129.0.xcdatamodel; sourceTree = ""; }; C9B82AAE2E60640000183723 /* store2-129-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-129-0.wiredatabase"; sourceTree = ""; }; CB181C7D2D3F8D7F00A80AB4 /* OneOnOneSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneOnOneSource.swift; sourceTree = ""; }; CB1821A42D412FA100A80AB4 /* OneOnOneSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneOnOneSourceTests.swift; sourceTree = ""; }; @@ -1215,11 +1189,8 @@ CB50EB772DF07003005EECD7 /* MultipartAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipartAttachment.swift; sourceTree = ""; }; CB7979172C747652006FBA58 /* WireTransportSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTransportSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CB79791A2C7476AC006FBA58 /* TestSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSetup.swift; sourceTree = ""; }; - CBAE486A2DC4C82900C62C4E /* zmessaging2.126.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.126.0.xcdatamodel; sourceTree = ""; }; CBAEABE82DC8DA8A00C62C4E /* store2-126-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-126-0.wiredatabase"; sourceTree = ""; }; CBB67B692E33FA2200FA52AA /* store2-128-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-128-0.wiredatabase"; sourceTree = ""; }; - CBBCDA432E33BDE8002E1B17 /* zmessaging2.128.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.128.0.xcdatamodel; sourceTree = ""; }; - CBED6B422D91A3FC00328BED /* zmessaging2.123.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.123.0.xcdatamodel; sourceTree = ""; }; CBF4F17E2D36935300C9638B /* ConnectionValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionValidator.swift; sourceTree = ""; }; CE4EDC081D6D9A3D002A20AA /* Reaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Reaction.swift; path = Reaction/Reaction.swift; sourceTree = ""; }; CE4EDC0A1D6DC2D2002A20AA /* ConversationMessage+Reaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConversationMessage+Reaction.swift"; sourceTree = ""; }; @@ -1244,10 +1215,7 @@ E6A2398F2B7F6F50004E48C2 /* MockActorOneOnOneMigrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockActorOneOnOneMigrator.swift; sourceTree = ""; }; E6A239922B7F6F82004E48C2 /* MockActorOneOnOneProtocolSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockActorOneOnOneProtocolSelector.swift; sourceTree = ""; }; E6A5BBA52B0E33DB00ACC236 /* CoreDataMessagingMigrationVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataMessagingMigrationVersion.swift; sourceTree = ""; }; - E6A5BBAD2B0E564200ACC236 /* WireDataModelBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireDataModelBundle.swift; sourceTree = ""; }; - E6BB79552C36DDA9003B821B /* zmessaging2.118.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.118.0.xcdatamodel; sourceTree = ""; }; E6BB79582C36EBE0003B821B /* store2-118-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-118-0.wiredatabase"; sourceTree = ""; }; - E6BDA1132B16421300488D92 /* zmessaging2.110.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.110.0.xcdatamodel; sourceTree = ""; }; E6BDA1142B1642A400488D92 /* store2-110-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-110-0.wiredatabase"; sourceTree = ""; }; E6BFE8372B3320C7000F0FBE /* DatabaseMigrationHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseMigrationHelper.swift; sourceTree = ""; }; E6BFE8392B332DDB000F0FBE /* DatabaseMigrationTests+ParticipantRole.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+ParticipantRole.swift"; sourceTree = ""; }; @@ -1273,36 +1241,6 @@ E6E5044D2BC56EDE004948E7 /* LAContextStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LAContextStorageTests.swift; sourceTree = ""; }; E6E5044F2BC571BF004948E7 /* AuthenticationContextTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationContextTests.swift; sourceTree = ""; }; E6E68B2A2B18D7B4003C29D2 /* ZMMessage+ServerTimestamp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMMessage+ServerTimestamp.swift"; sourceTree = ""; }; - E6F443052B16294000D2B08A /* zmessaging2.98.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.98.0.xcdatamodel; sourceTree = ""; }; - E6F443062B16294000D2B08A /* zmessaging2.102.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.102.0.xcdatamodel; sourceTree = ""; }; - E6F443072B16294000D2B08A /* zmessaging2.106.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.106.0.xcdatamodel; sourceTree = ""; }; - E6F443082B16294000D2B08A /* zmessaging2.101.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.101.0.xcdatamodel; sourceTree = ""; }; - E6F443092B16294000D2B08A /* zmessaging2.105.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.105.0.xcdatamodel; sourceTree = ""; }; - E6F4430A2B16294000D2B08A /* zmessaging2.88.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.88.0.xcdatamodel; sourceTree = ""; }; - E6F4430B2B16294000D2B08A /* zmessaging2.95.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.95.0.xcdatamodel; sourceTree = ""; }; - E6F4430C2B16294000D2B08A /* zmessaging2.82.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.82.0.xcdatamodel; sourceTree = ""; }; - E6F4430D2B16294000D2B08A /* zmessaging2.86.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.86.0.xcdatamodel; sourceTree = ""; }; - E6F4430E2B16294000D2B08A /* zmessaging2.91.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.91.0.xcdatamodel; sourceTree = ""; }; - E6F4430F2B16294000D2B08A /* zmessaging2.108.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.108.0.xcdatamodel; sourceTree = ""; }; - E6F443102B16294000D2B08A /* zmessaging2.81.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.81.0.xcdatamodel; sourceTree = ""; }; - E6F443112B16294000D2B08A /* zmessaging2.96.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.96.0.xcdatamodel; sourceTree = ""; }; - E6F443122B16294000D2B08A /* zmessaging2.92.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.92.0.xcdatamodel; sourceTree = ""; }; - E6F443132B16294000D2B08A /* zmessaging2.85.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.85.0.xcdatamodel; sourceTree = ""; }; - E6F443142B16294000D2B08A /* zmessaging2.109.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.109.0.xcdatamodel; sourceTree = ""; }; - E6F443152B16294000D2B08A /* zmessaging2.84.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.84.0.xcdatamodel; sourceTree = ""; }; - E6F443162B16294000D2B08A /* zmessaging2.93.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.93.0.xcdatamodel; sourceTree = ""; }; - E6F443172B16294000D2B08A /* zmessaging2.97.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.97.0.xcdatamodel; sourceTree = ""; }; - E6F443182B16294000D2B08A /* zmessaging2.80.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.80.0.xcdatamodel; sourceTree = ""; }; - E6F443192B16294000D2B08A /* zmessaging2.90.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.90.0.xcdatamodel; sourceTree = ""; }; - E6F4431A2B16294000D2B08A /* zmessaging2.87.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.87.0.xcdatamodel; sourceTree = ""; }; - E6F4431B2B16294000D2B08A /* zmessaging2.83.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.83.0.xcdatamodel; sourceTree = ""; }; - E6F4431C2B16294000D2B08A /* zmessaging2.94.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.94.0.xcdatamodel; sourceTree = ""; }; - E6F4431D2B16294000D2B08A /* zmessaging2.104.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.104.0.xcdatamodel; sourceTree = ""; }; - E6F4431E2B16294000D2B08A /* zmessaging2.100.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.100.0.xcdatamodel; sourceTree = ""; }; - E6F4431F2B16294000D2B08A /* zmessaging2.89.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.89.0.xcdatamodel; sourceTree = ""; }; - E6F443202B16294000D2B08A /* zmessaging2.99.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.99.0.xcdatamodel; sourceTree = ""; }; - E6F443212B16294000D2B08A /* zmessaging2.107.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.107.0.xcdatamodel; sourceTree = ""; }; - E6F443222B16294000D2B08A /* zmessaging2.103.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.103.0.xcdatamodel; sourceTree = ""; }; E90AAE33279719D8003C7DB0 /* store2-98-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-98-0.wiredatabase"; sourceTree = ""; }; E9C7DD9A27B533D000FB9AE8 /* AccessRoleMappingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessRoleMappingTests.swift; sourceTree = ""; }; EE002F212878345C0027D63A /* store2-104-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-104-0.wiredatabase"; sourceTree = ""; }; @@ -1341,7 +1279,6 @@ EE7A90ED2B21DE3B00B58E84 /* OneOnOneProtocolSelectorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneOnOneProtocolSelectorTests.swift; sourceTree = ""; }; EE7A90EF2B21E29E00B58E84 /* OneOnOneMigratorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneOnOneMigratorTests.swift; sourceTree = ""; }; EE84226F28EC353900B80FE5 /* MLSActionExecutorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSActionExecutorTests.swift; sourceTree = ""; }; - EE85C8AB2B55790400D3182D /* zmessaging2.113.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.113.0.xcdatamodel; sourceTree = ""; }; EE85C8B12B557C3D00D3182D /* DatabaseMigrationTests+OneOnOneConversation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+OneOnOneConversation.swift"; sourceTree = ""; }; EE8DA9662954A02B00F58B79 /* WireCryptobox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireCryptobox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EE8DA9692954A03100F58B79 /* WireTransport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTransport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1633,7 +1570,7 @@ CB5273202D9C0FA000CF8099 /* Channels */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Channels; sourceTree = ""; }; CB9615DC2D47B0E10016389E /* EntityValidation */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = EntityValidation; sourceTree = ""; }; CBAE486D2DC5140300C62C4E /* WireCellsMessageAttachmentDraftEntity */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireCellsMessageAttachmentDraftEntity; sourceTree = ""; }; - CBBCDA452E33CD80002E1B17 /* WireCellsLocalAsset */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireCellsLocalAsset; sourceTree = ""; }; + CBC41A252EB50889000769CE /* SchemaTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = SchemaTests; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2626,7 +2563,6 @@ EE04084D28CA85B2009E4B8D /* Date+Helpers.swift */, 0129E7FA29A520EB0065E6DB /* SafeFileContext.swift */, 0614E96C2A863EED007BB1F6 /* NSPredicate+BaseCompounds.swift */, - E6A5BBAD2B0E564200ACC236 /* WireDataModelBundle.swift */, 1657FA9B2D9C432200A7B337 /* CoreCryptoContextProtocolExt.swift */, E66029D12BDA43E10033C524 /* SearchUsersCache.swift */, ); @@ -2684,7 +2620,6 @@ F9A7080A1CAEEB7400C2F5FE /* Model */ = { isa = PBXGroup; children = ( - CBBCDA452E33CD80002E1B17 /* WireCellsLocalAsset */, CBAE486D2DC5140300C62C4E /* WireCellsMessageAttachmentDraftEntity */, 069D07B6256266F000DBA592 /* FeatureConfiguration */, 06F98D61243B2446007E914A /* DigitalSignature */, @@ -3045,9 +2980,6 @@ F9C9A6771CAD7A790039E10C /* Resources */ = { isa = PBXGroup; children = ( - 017962AB2B853C8600D6C7B6 /* Databases Changelog.md */, - 0158DF1A2C594B1600C7BFFD /* ZMEventModel.xcdatamodeld */, - E6F443042B16294000D2B08A /* zmessaging.xcdatamodeld */, F9C9A5DC1CAD76A50039E10C /* Info.plist */, F9C9A6781CAD7A790039E10C /* Configurations */, ); @@ -3110,6 +3042,7 @@ F9C9A79A1CAEA8FC0039E10C /* Source */ = { isa = PBXGroup; children = ( + CBC41A252EB50889000769CE /* SchemaTests */, E6E504442BC56DF1004948E7 /* Authentication */, 59BAE10E2C3429DA00F8EEDC /* ConversationSearch */, 069BCC632B3098F500DF4EC2 /* E2EIdentity */, @@ -3342,7 +3275,7 @@ CB5273202D9C0FA000CF8099 /* Channels */, CB9615DC2D47B0E10016389E /* EntityValidation */, CBAE486D2DC5140300C62C4E /* WireCellsMessageAttachmentDraftEntity */, - CBBCDA452E33CD80002E1B17 /* WireCellsLocalAsset */, + CBC41A252EB50889000769CE /* SchemaTests */, ); name = WireDataModelTests; productName = WireDataModelTests; @@ -3754,7 +3687,6 @@ 8704676B21513DE900C628D7 /* ZMOTRMessage+Unarchive.swift in Sources */, 63CA8215240812620073426A /* ZMClientMessage+Composite.swift in Sources */, 013887A82B9A5C6B00323DD0 /* RemoveDuplicatePreAction.swift in Sources */, - E6A5BBAE2B0E564200ACC236 /* WireDataModelBundle.swift in Sources */, F9A706A91CAEE01D00C2F5FE /* StringKeyPath.swift in Sources */, 63298D9A2434D04D006B6018 /* GenericMessage+External.swift in Sources */, A90676EA238EB05F006417AC /* Action.swift in Sources */, @@ -3815,7 +3747,6 @@ 63370CC9242E3B990072C37F /* ZMMessage+Conversation.swift in Sources */, 63B1335729A503D100009D84 /* MLSActionsProvider.swift in Sources */, EEC794F42A384421008E1A3B /* MLSDecryptionService.swift in Sources */, - 0158DF212C594B3600C7BFFD /* ZMEventModel.xcdatamodeld in Sources */, 5966D8362BD6AF1700305BBC /* UserPropertyNormalizationResult.swift in Sources */, 1672A6282344F10700380537 /* FolderList.swift in Sources */, 54E3EE3F1F6169A800A261E3 /* ZMAssetClientMessage+FileMessageData.swift in Sources */, @@ -3829,7 +3760,6 @@ 63BEF5872A2636BC00F482E8 /* MLSConferenceInfo.swift in Sources */, EEC794F62A384464008E1A3B /* MLSEncryptionService.swift in Sources */, F9A706A31CAEE01D00C2F5FE /* ConversationListChangeInfo.swift in Sources */, - E6F443232B16294400D2B08A /* zmessaging.xcdatamodeld in Sources */, EE9AD9162696F01700DD5F51 /* LegacyFeatureRepository.swift in Sources */, 63B1337329A798C800009D84 /* ProteusProvider.swift in Sources */, 0630E4B6257F888600C75BFB /* NSManagedObjectContext+AppLock.swift in Sources */, @@ -4625,86 +4555,6 @@ productName = PINCache; }; /* End XCSwiftPackageProductDependency section */ - -/* Begin XCVersionGroup section */ - 0158DF1A2C594B1600C7BFFD /* ZMEventModel.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - 0158DF1B2C594B1600C7BFFD /* ZMEventModel5.0.xcdatamodel */, - 0158DF1C2C594B1600C7BFFD /* ZMEventModel6.0.xcdatamodel */, - 0158DF1D2C594B1600C7BFFD /* ZMEventModel2.0.xcdatamodel */, - 0158DF1E2C594B1600C7BFFD /* ZMEventModel.xcdatamodel */, - 0158DF1F2C594B1600C7BFFD /* ZMEventModel3.0.xcdatamodel */, - 0158DF202C594B1600C7BFFD /* ZMEventModel4.0.xcdatamodel */, - ); - currentVersion = 0158DF1C2C594B1600C7BFFD /* ZMEventModel6.0.xcdatamodel */; - path = ZMEventModel.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; - E6F443042B16294000D2B08A /* zmessaging.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - 884371622EB8DB58003DA083 /* zmessaging2.132.0.xcdatamodel */, - 599033E02EA79C740046D3C3 /* zmessaging2.131.0.xcdatamodel */, - 59085C5C2E8569D800882DD1 /* zmessaging2.130.0.xcdatamodel */, - C9B8074D2E605B3100183723 /* zmessaging2.129.0.xcdatamodel */, - CBBCDA432E33BDE8002E1B17 /* zmessaging2.128.0.xcdatamodel */, - 01943A0B2E01A11C0005CD1E /* zmessaging2.127.0.xcdatamodel */, - CBAE486A2DC4C82900C62C4E /* zmessaging2.126.0.xcdatamodel */, - 01423BC72DB00D8200C49567 /* zmessaging2.125.0.xcdatamodel */, - 01A4709E2DAD4A1D00B1B2E7 /* zmessaging2.124.0.xcdatamodel */, - CBED6B422D91A3FC00328BED /* zmessaging2.123.0.xcdatamodel */, - 0176BDCF2D515224002C33DE /* zmessaging2.122.0.xcdatamodel */, - 5930D9C22D43BC33009E3514 /* zmessaging2.121.0.xcdatamodel */, - 017B55732CFFA599005FFBD4 /* zmessaging2.120.0.xcdatamodel */, - 01586D3F2CAECE8B00C3BCE1 /* zmessaging2.119.0.xcdatamodel */, - E6BB79552C36DDA9003B821B /* zmessaging2.118.0.xcdatamodel */, - 16058B262BDA8987003C82C2 /* zmessaging2.117.0.xcdatamodel */, - 162F85A62BC586A3007E2CB6 /* zmessaging2.116.0.xcdatamodel */, - 16EFC3AC2BAB1FFE0046C1D7 /* zmessaging2.115.0.xcdatamodel */, - 0153CA842B8540F0000000CA /* zmessaging2.114.0.xcdatamodel */, - EE85C8AB2B55790400D3182D /* zmessaging2.113.0.xcdatamodel */, - 6398545E2B346A0700AA10DE /* zmessaging2.112.0.xcdatamodel */, - 01B6A89E2B16252300E409A0 /* zmessaging2.111.0.xcdatamodel */, - E6BDA1132B16421300488D92 /* zmessaging2.110.0.xcdatamodel */, - E6F443142B16294000D2B08A /* zmessaging2.109.0.xcdatamodel */, - E6F4430F2B16294000D2B08A /* zmessaging2.108.0.xcdatamodel */, - E6F443212B16294000D2B08A /* zmessaging2.107.0.xcdatamodel */, - E6F443072B16294000D2B08A /* zmessaging2.106.0.xcdatamodel */, - E6F443092B16294000D2B08A /* zmessaging2.105.0.xcdatamodel */, - E6F4431D2B16294000D2B08A /* zmessaging2.104.0.xcdatamodel */, - E6F443222B16294000D2B08A /* zmessaging2.103.0.xcdatamodel */, - E6F443062B16294000D2B08A /* zmessaging2.102.0.xcdatamodel */, - E6F443082B16294000D2B08A /* zmessaging2.101.0.xcdatamodel */, - E6F4431E2B16294000D2B08A /* zmessaging2.100.0.xcdatamodel */, - E6F443202B16294000D2B08A /* zmessaging2.99.0.xcdatamodel */, - E6F443052B16294000D2B08A /* zmessaging2.98.0.xcdatamodel */, - E6F443172B16294000D2B08A /* zmessaging2.97.0.xcdatamodel */, - E6F443112B16294000D2B08A /* zmessaging2.96.0.xcdatamodel */, - E6F4430B2B16294000D2B08A /* zmessaging2.95.0.xcdatamodel */, - E6F4431C2B16294000D2B08A /* zmessaging2.94.0.xcdatamodel */, - E6F443162B16294000D2B08A /* zmessaging2.93.0.xcdatamodel */, - E6F443122B16294000D2B08A /* zmessaging2.92.0.xcdatamodel */, - E6F4430E2B16294000D2B08A /* zmessaging2.91.0.xcdatamodel */, - E6F443192B16294000D2B08A /* zmessaging2.90.0.xcdatamodel */, - E6F4431F2B16294000D2B08A /* zmessaging2.89.0.xcdatamodel */, - E6F4430A2B16294000D2B08A /* zmessaging2.88.0.xcdatamodel */, - E6F4431A2B16294000D2B08A /* zmessaging2.87.0.xcdatamodel */, - E6F4430D2B16294000D2B08A /* zmessaging2.86.0.xcdatamodel */, - E6F443132B16294000D2B08A /* zmessaging2.85.0.xcdatamodel */, - E6F443152B16294000D2B08A /* zmessaging2.84.0.xcdatamodel */, - E6F4431B2B16294000D2B08A /* zmessaging2.83.0.xcdatamodel */, - E6F4430C2B16294000D2B08A /* zmessaging2.82.0.xcdatamodel */, - E6F443102B16294000D2B08A /* zmessaging2.81.0.xcdatamodel */, - E6F443182B16294000D2B08A /* zmessaging2.80.0.xcdatamodel */, - ); - currentVersion = 884371622EB8DB58003DA083 /* zmessaging2.132.0.xcdatamodel */; - path = zmessaging.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; -/* End XCVersionGroup section */ }; rootObject = F9C9A4F31CAD5DF10039E10C /* Project object */; } diff --git a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj index e4a110fae4f..b446f4d3223 100644 --- a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj +++ b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ 591B6E2F2C8B0988009F8A7B /* WireMockTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEC80B5629B6054A00099727 /* WireMockTransport.framework */; }; 59537D8D2CFF9FB300920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8C2CFF9FB300920B59 /* WireLogging */; }; 630A582D29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */; }; + CBC41A352EB50F42000769CE /* WireNotificationEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 067ECB3A2487A93D00701956 /* WireNotificationEngine.framework */; }; EE0BA28A29D59B1D004E93B5 /* NotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */; }; EE3245FE28229E8600F2A84A /* ApplicationStatusDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */; }; EE32460028229F6B00F2A84A /* ClientRegistrationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3245FF28229F6B00F2A84A /* ClientRegistrationStatus.swift */; }; @@ -36,6 +37,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + CBC41A372EB50F42000769CE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0660428C247FE76A00A5F161 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 067ECB392487A93D00701956; + remoteInfo = WireNotificationEngine; + }; EE76166A299E60C9005DB75F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0660428C247FE76A00A5F161 /* Project object */; @@ -135,6 +143,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CBC41A352EB50F42000769CE /* WireNotificationEngine.framework in Frameworks */, 591B6E2F2C8B0988009F8A7B /* WireMockTransport.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -346,6 +355,7 @@ buildRules = ( ); dependencies = ( + CBC41A382EB50F42000769CE /* PBXTargetDependency */, ); name = WireNotificationEngineTestHost; productName = WireNotificationEngineTestHost; @@ -462,6 +472,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + CBC41A382EB50F42000769CE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 067ECB392487A93D00701956 /* WireNotificationEngine */; + targetProxy = CBC41A372EB50F42000769CE /* PBXContainerItemProxy */; + }; EE76166B299E60C9005DB75F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 067ECB392487A93D00701956 /* WireNotificationEngine */; diff --git a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj index fabffaa524e..a1180a36652 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -255,6 +255,7 @@ CB5120532C6FD69F000C8FEC /* WireTransportSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB5120522C6FD69F000C8FEC /* WireTransportSupport.framework */; }; CB5A461D2D940BB700D469F1 /* Payload+ConversationGroupType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5A461C2D940BA600D469F1 /* Payload+ConversationGroupType.swift */; }; CB7979052C73663B006FBA58 /* WireRequestStrategySupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEA58F192B71179D006DEE32 /* WireRequestStrategySupport.framework */; }; + CBC41A302EB50DBE000769CE /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; }; CBF2BD5F2C5BD468002BCBDD /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBF2BD5E2C5BD468002BCBDD /* TestSetup.swift */; }; D33B57B12A56BDCA0078A4F9 /* FederationTerminationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D33B57B02A56BDCA0078A4F9 /* FederationTerminationManager.swift */; }; D3DA067C2A5D9EF700BA9CEB /* FederationTerminationManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3DA067B2A5D9EF700BA9CEB /* FederationTerminationManagerTest.swift */; }; @@ -452,6 +453,13 @@ remoteGlobalIDString = EEA58F182B71179D006DEE32; remoteInfo = WireRequestStrategySupport; }; + CBC41A322EB50DBE000769CE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 166901611D707509000FE4AF /* Project object */; + proxyType = 1; + remoteGlobalIDString = 166901691D707509000FE4AF; + remoteInfo = WireRequestStrategy; + }; F154EDD61F447BB600CB8184 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 166901611D707509000FE4AF /* Project object */; @@ -1004,6 +1012,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CBC41A302EB50DBE000769CE /* WireRequestStrategy.framework in Frameworks */, 591B6E3F2C8B09B3009F8A7B /* WireTesting.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2265,6 +2274,7 @@ buildRules = ( ); dependencies = ( + CBC41A332EB50DBE000769CE /* PBXTargetDependency */, ); name = WireRequestStrategyTestHost; productName = WireRequestStrategyTestHost; @@ -2821,6 +2831,11 @@ target = EEA58F182B71179D006DEE32 /* WireRequestStrategySupport */; targetProxy = CB7979072C73663B006FBA58 /* PBXContainerItemProxy */; }; + CBC41A332EB50DBE000769CE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 166901691D707509000FE4AF /* WireRequestStrategy */; + targetProxy = CBC41A322EB50DBE000769CE /* PBXContainerItemProxy */; + }; F154EDD71F447BB600CB8184 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = F154EDC31F447B6C00CB8184 /* WireRequestStrategyTestHost */; diff --git a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj index 86e5b0516ef..c6b701796b0 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ 59537D8B2CFF9F8F00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8A2CFF9F8F00920B59 /* WireLogging */; }; BFA18BD41D806050005C281B /* BaseSharingSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA18BD31D806050005C281B /* BaseSharingSessionTests.swift */; }; CB79791D2C748580006FBA58 /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB79791C2C748580006FBA58 /* TestSetup.swift */; }; + CBC41A3A2EB50FBA000769CE /* WireShareEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5470D3E81D76E1B000FDE440 /* WireShareEngine.framework */; }; CE7FBFC41E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7FBFC31E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift */; }; CEB50AEC1DF9BADF00211B30 /* OperationLoopTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEB50AEB1DF9BADF00211B30 /* OperationLoopTests.swift */; }; EE67F6F5296F093E001D7C88 /* WireTesting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE67F6F4296F093E001D7C88 /* WireTesting.framework */; }; @@ -53,6 +54,13 @@ remoteGlobalIDString = 5470D3E71D76E1B000FDE440; remoteInfo = "wire-ios-share-engine"; }; + CBC41A3C2EB50FBA000769CE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 5470D3DF1D76E1B000FDE440 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5470D3E71D76E1B000FDE440; + remoteInfo = WireShareEngine; + }; F1E48012207E4C77008D4299 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 5470D3DF1D76E1B000FDE440 /* Project object */; @@ -153,6 +161,7 @@ buildActionMask = 2147483647; files = ( EE67F6F5296F093E001D7C88 /* WireTesting.framework in Frameworks */, + CBC41A3A2EB50FBA000769CE /* WireShareEngine.framework in Frameworks */, 591B6E382C8B0995009F8A7B /* WireMockTransport.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -347,6 +356,7 @@ buildRules = ( ); dependencies = ( + CBC41A3D2EB50FBA000769CE /* PBXTargetDependency */, ); name = WireShareEngineTestHost; productName = WireShareEngineTestHost; @@ -481,6 +491,11 @@ target = 5470D3E71D76E1B000FDE440 /* WireShareEngine */; targetProxy = 5470D3F41D76E1B000FDE440 /* PBXContainerItemProxy */; }; + CBC41A3D2EB50FBA000769CE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5470D3E71D76E1B000FDE440 /* WireShareEngine */; + targetProxy = CBC41A3C2EB50FBA000769CE /* PBXContainerItemProxy */; + }; F1E48013207E4C77008D4299 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = F154EE071F44826400CB8184 /* WireShareEngineTestHost */; diff --git a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/xcshareddata/xcschemes/WireSyncEngine.xcscheme b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/xcshareddata/xcschemes/WireSyncEngine.xcscheme index af0038aeabf..48e0dfa5e79 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/xcshareddata/xcschemes/WireSyncEngine.xcscheme +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/xcshareddata/xcschemes/WireSyncEngine.xcscheme @@ -135,12 +135,12 @@