Skip to content

Commit 076a3fc

Browse files
committed
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/rename-wirelogging-to-wirelegacylogging-WPB-14876
# Conflicts: # WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift # wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj
2 parents d38f596 + 3c82b6a commit 076a3fc

File tree

128 files changed

+2543
-1235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+2543
-1235
lines changed

β€Ž.github/workflows/test_develop.ymlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
trigger_tests:
1515
strategy:
1616
matrix:
17-
branch: [develop, release/cycle-4.8, release/cycle-4.9] # List other branches here
17+
branch: [develop, release/cycle-4.9, release/cycle-4.10] # List other branches here
1818
fail-fast: false # avoid to fail one job
1919
uses: ./.github/workflows/_reusable_run_tests.yml
2020
with:

β€Žwire-ios-data-model/Resources/Databases Changelog.mdβ€Ž renamed to β€ŽWireData/Sources/WireData/Schema/Databases Changelog.mdβ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
As it is hard to spot changes from version to version of database models (.xcdatamodeld), here's a changelog highlighting changes per version.
44

5+
## Special changes
6+
7+
### Moving of `zmessaging` & `ZMEventModel` to `WireData` SPM target
8+
9+
* 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.
10+
511
## zmessaging
612

713
### 2.132.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<attribute name="source" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
1212
<attribute name="uuidString" optional="YES" attributeType="String" syncable="YES"/>
1313
</entity>
14-
<entity name="StoredUpdateEventEnvelope" representedClassName=".StoredUpdateEventEnvelope" syncable="YES">
14+
<entity name="StoredUpdateEventEnvelope" representedClassName="WireDataModel.StoredUpdateEventEnvelope" syncable="YES">
1515
<attribute name="data" attributeType="Binary" syncable="YES"/>
1616
<attribute name="sortIndex" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
1717
</entity>

0 commit comments

Comments
Β (0)