chore: move db models to wire data package - WPB-19688

WireData/Package.swift

@@ -8,6 +8,7 @@ let package = Package(
     products: [
         .library(
             name: "WireData",
+            type: .dynamic,
             targets: ["WireData"]
         ),
     ],

wire-ios-data-model/Resources/Databases Changelog.md → 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` in version `6.0`. These changes did not require a migration. See [PR](https://github.com/wireapp/wire-ios/pull/3521) for more information.
+
 ## zmessaging
 
 ### 2.129.0
@@ -111,7 +117,7 @@ PostAction to migrate oneOneOneConversations
 
 * removed `activationLocationLatitude` attribute from `UserClient`
 * removed `activationLocationLongitude` attribute from `UserClient`
- 
+
 ## ZMEventModel
 
 ### 6.0
@@ -125,4 +131,3 @@ PostAction to migrate oneOneOneConversations
 ### 4.0
 
 TBD
-

wire-ios-data-model/Resources/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents → WireData/Sources/WireData/Schema/ZMEventModel.xcdatamodeld/ZMEventModel6.0.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23E224" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="6.0">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23788.4" systemVersion="24G90" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="6.0">
     <entity name="StoredUpdateEvent" representedClassName="StoredUpdateEvent" syncable="YES">
         <attribute name="debugInformation" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="eventHash" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -11,7 +11,7 @@
         <attribute name="source" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="uuidString" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
-    <entity name="StoredUpdateEventEnvelope" representedClassName=".StoredUpdateEventEnvelope" syncable="YES">
+    <entity name="StoredUpdateEventEnvelope" representedClassName="WireDataModel.StoredUpdateEventEnvelope" syncable="YES">
         <attribute name="data" attributeType="Binary" syncable="YES"/>
         <attribute name="sortIndex" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
     </entity>

wire-ios-data-model/Resources/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents → WireData/Sources/WireData/Schema/zmessaging.xcdatamodeld/zmessaging2.100.0.xcdatamodel/contents

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="21C52" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="2.100.0">
-    <entity name="Action" representedClassName=".Action" syncable="YES">
+    <entity name="Action" representedClassName="WireDataModel.Action" syncable="YES">
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="role" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Role" inverseName="actions" inverseEntity="Role" syncable="YES"/>
     </entity>
-    <entity name="AddressBookEntry" representedClassName=".AddressBookEntry" syncable="YES">
+    <entity name="AddressBookEntry" representedClassName="WireDataModel.AddressBookEntry" syncable="YES">
         <attribute name="cachedName" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="localIdentifier" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="addressBookEntry" inverseEntity="User" syncable="YES"/>
     </entity>
-    <entity name="AssetClientMessage" representedClassName=".ZMAssetClientMessage" parentEntity="Message" syncable="YES">
+    <entity name="AssetClientMessage" representedClassName="WireDataModel.ZMAssetClientMessage" parentEntity="Message" syncable="YES">
         <attribute name="assetId" optional="YES" transient="YES" syncable="YES"/>
         <attribute name="assetId_data" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="associatedTaskIdentifier" optional="YES" transient="YES" syncable="YES"/>
@@ -23,13 +23,13 @@
         <attribute name="version" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <relationship name="dataSet" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GenericMessageData" inverseName="asset" inverseEntity="GenericMessageData" syncable="YES"/>
     </entity>
-    <entity name="ButtonState" representedClassName=".ButtonState" syncable="YES">
+    <entity name="ButtonState" representedClassName="WireDataModel.ButtonState" syncable="YES">
         <attribute name="isExpired" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="remoteIdentifier" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="stateValue" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <relationship name="message" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Message" inverseName="buttonStates" inverseEntity="Message" syncable="YES"/>
     </entity>
-    <entity name="ClientMessage" representedClassName=".ZMClientMessage" parentEntity="Message" syncable="YES">
+    <entity name="ClientMessage" representedClassName="WireDataModel.ZMClientMessage" parentEntity="Message" syncable="YES">
         <attribute name="linkPreviewState" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="updatedTimestamp" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <relationship name="dataSet" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GenericMessageData" inverseName="message" inverseEntity="GenericMessageData" syncable="YES"/>
@@ -101,7 +101,7 @@
             </compoundIndex>
         </compoundIndexes>
     </entity>
-    <entity name="Feature" representedClassName=".Feature" syncable="YES">
+    <entity name="Feature" representedClassName="WireDataModel.Feature" syncable="YES">
         <attribute name="configData" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="hasInitialDefault" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
@@ -110,7 +110,7 @@
         <attribute name="needsToNotifyUser" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="statusValue" attributeType="String" syncable="YES"/>
     </entity>
-    <entity name="FeatureFlag" representedClassName=".FeatureFlag" syncable="YES">
+    <entity name="FeatureFlag" representedClassName="WireDataModel.FeatureFlag" syncable="YES">
         <attribute name="identifier" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="isEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
@@ -134,7 +134,7 @@
         <attribute name="originalSize_data" optional="YES" attributeType="Binary" syncable="YES"/>
     </entity>
     <entity name="KnockMessage" representedClassName="ZMKnockMessage" parentEntity="Message" syncable="YES"/>
-    <entity name="Label" representedClassName=".Label" syncable="YES">
+    <entity name="Label" representedClassName="WireDataModel.Label" syncable="YES">
         <attribute name="markedForDeletion" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
@@ -143,7 +143,7 @@
         <attribute name="type" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <relationship name="conversations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Conversation" inverseName="labels" inverseEntity="Conversation" syncable="YES"/>
     </entity>
-    <entity name="Member" representedClassName=".Member" syncable="YES">
+    <entity name="Member" representedClassName="WireDataModel.Member" syncable="YES">
         <attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="needsToBeUpdatedFromBackend" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="permissionsRawValue" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -201,19 +201,19 @@
         <relationship name="message" maxCount="1" deletionRule="Nullify" destinationEntity="Message" inverseName="confirmations" inverseEntity="Message" syncable="YES"/>
         <relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" syncable="YES"/>
     </entity>
-    <entity name="ParticipantRole" representedClassName=".ParticipantRole" syncable="YES">
+    <entity name="ParticipantRole" representedClassName="WireDataModel.ParticipantRole" syncable="YES">
         <attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
         <relationship name="conversation" maxCount="1" deletionRule="Nullify" destinationEntity="Conversation" inverseName="participantRoles" inverseEntity="Conversation" syncable="YES"/>
         <relationship name="role" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Role" inverseName="participantRoles" inverseEntity="Role" syncable="YES"/>
         <relationship name="user" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="participantRoles" inverseEntity="User" syncable="YES"/>
     </entity>
-    <entity name="Reaction" representedClassName=".Reaction" syncable="YES">
+    <entity name="Reaction" representedClassName="WireDataModel.Reaction" syncable="YES">
         <attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
         <attribute name="unicodeValue" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="message" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Message" inverseName="reactions" inverseEntity="Message" syncable="YES"/>
         <relationship name="users" toMany="YES" deletionRule="Nullify" destinationEntity="User" inverseName="reactions" inverseEntity="User" syncable="YES"/>
     </entity>
-    <entity name="Role" representedClassName=".Role" syncable="YES">
+    <entity name="Role" representedClassName="WireDataModel.Role" syncable="YES">
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="actions" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Action" inverseName="role" inverseEntity="Action" syncable="YES"/>
         <relationship name="conversation" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Conversation" inverseName="nonTeamRoles" inverseEntity="Conversation" syncable="YES"/>
@@ -241,7 +241,7 @@
         <relationship name="removedUsers" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="User" inverseName="showingUserRemoved" inverseEntity="User" syncable="YES"/>
         <relationship name="users" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="User" inverseName="systemMessages" inverseEntity="User" syncable="YES"/>
     </entity>
-    <entity name="Team" representedClassName=".Team" syncable="YES">
+    <entity name="Team" representedClassName="WireDataModel.Team" syncable="YES">
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="needsToBeUpdatedFromBackend" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="needsToDownloadRoles" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
@@ -306,7 +306,7 @@
         <relationship name="showingUserRemoved" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SystemMessage" inverseName="removedUsers" inverseEntity="SystemMessage" syncable="YES"/>
         <relationship name="systemMessages" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SystemMessage" inverseName="users" inverseEntity="SystemMessage" syncable="YES"/>
     </entity>
-    <entity name="UserClient" representedClassName=".UserClient" syncable="YES">
+    <entity name="UserClient" representedClassName="WireDataModel.UserClient" syncable="YES">
         <attribute name="activationAddress" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="activationDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="activationLocationLatitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
@@ -369,4 +369,4 @@
         <element name="User" positionX="-434" positionY="-72" width="128" height="704"/>
         <element name="UserClient" positionX="9" positionY="153" width="128" height="539"/>
     </elements>
-</model>
+</model>