Skip to content

Commit

Permalink
Merge branch 'release/0.23.14/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
pixlwave committed Aug 9, 2022
2 parents 4ef80d4 + 431a5ae commit 7a69ef4
Show file tree
Hide file tree
Showing 63 changed files with 573 additions and 111 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/ci-crypto-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
# Cache for Xcode env
- uses: actions/cache@v2
with:
Expand All @@ -50,7 +49,6 @@ jobs:
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-
- name: Start synapse server
uses: michaelkaye/setup-matrix-synapse@v1.0.3
with:
Expand All @@ -62,21 +60,27 @@ jobs:
run: |
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
# Main step
- name: Crypto tests
run: bundle exec fastlane test testplan:CryptoTests

# Store artifacts
- uses: actions/upload-artifact@v2
if: always()
with:
name: report.html
path: build/test/report.html
- uses: actions/upload-artifact@v2
if: always()
with:
name: report.junit
path: build/test/report.junit
- uses: actions/upload-artifact@v2
if: always()
with:
name: MatrixSDK-macOS.xcresult
path: build/test/MatrixSDK-macOS.xcresult/

# Upload coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
91 changes: 91 additions & 0 deletions .github/workflows/ci-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: Integration Tests CI

on:
# Triggers the workflow on any pull request and push to develop
push:
branches: [ develop ]
pull_request:

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
integration-tests:
name: Integration Tests
runs-on: macos-11

concurrency:
# When running on develop, use the sha to allow all runs of this workflow to run concurrently.
# Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
group: ${{ github.ref == 'refs/heads/develop' && format('tests-integration-develop-{0}', github.sha) || format('tests-integration-{0}', github.ref) }}
cancel-in-progress: true

steps:
- uses: actions/checkout@v2

# Common cache
# Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
- uses: actions/cache@v2
with:
path: Pods
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
restore-keys: |
${{ runner.os }}-pods-
- uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-
# Cache for python env for Synapse
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Cache pip
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
# Set up a Synapse server
- name: Start synapse server
uses: michaelkaye/setup-matrix-synapse@v1.0.3
with:
uploadLogs: true
httpPort: 8080
disableRateLimiting: true

# Common setup
# Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
- name: Bundle install
run: |
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
# Main step
- name: Integration tests
run: bundle exec fastlane test testplan:AllWorkingTests

# Store artifacts
- uses: actions/upload-artifact@v2
if: always()
with:
name: report.html
path: build/test/report.html
- uses: actions/upload-artifact@v2
if: always()
with:
name: report.junit
path: build/test/report.junit
- uses: actions/upload-artifact@v2
if: always()
with:
name: MatrixSDK-macOS.xcresult
path: build/test/MatrixSDK-macOS.xcresult/

# Upload coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ DerivedData
*.ipa
*.xcuserstate
*.DS_Store
.vscode/
vendor/

# CocoaPods
#
Expand Down
14 changes: 14 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## Changes in 0.23.14 (2022-08-09)

🙌 Improvements

- CI: Enable integration tests on GitHub actions ([#1537](https://github.com/matrix-org/matrix-ios-sdk/pull/1537))
- App Layout: Added breadcrumbs data fetcher and updated room summary data type to reflect new needs ([#6407](https://github.com/vector-im/element-ios/issues/6407))
- App Layout: added MXSpace.minimumPowerLevelForAddingRoom() and MXSpaceService.rootSpaces ([#6410](https://github.com/vector-im/element-ios/issues/6410))

🐛 Bugfixes

- MXRestClient: Send an empty dictionary when calling /join to be spec compliant. ([#6481](https://github.com/vector-im/element-ios/issues/6481))
- App Layout: exclude room summaries without notifications from unread list ([#6511](https://github.com/vector-im/element-ios/issues/6511))


## Changes in 0.23.13 (2022-07-26)

🙌 Improvements
Expand Down
2 changes: 1 addition & 1 deletion MatrixSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "MatrixSDK"
s.version = "0.23.13"
s.version = "0.23.14"
s.summary = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"

s.description = <<-DESC
Expand Down
12 changes: 12 additions & 0 deletions MatrixSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,8 @@
32618E7220ED2DF500E1D2EA /* MXFilterJSONModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 32618E7020ED2DF500E1D2EA /* MXFilterJSONModel.m */; };
32618E7B20EFA45B00E1D2EA /* MXRoomMembers.h in Headers */ = {isa = PBXBuildFile; fileRef = 32618E7920EFA45B00E1D2EA /* MXRoomMembers.h */; settings = {ATTRIBUTES = (Public, ); }; };
32618E7C20EFA45B00E1D2EA /* MXRoomMembers.m in Sources */ = {isa = PBXBuildFile; fileRef = 32618E7A20EFA45B00E1D2EA /* MXRoomMembers.m */; };
326277F1288BC21A009A0508 /* AllWorkingTests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 326277F0288BC219009A0508 /* AllWorkingTests.xctestplan */; };
326277F2288BC21A009A0508 /* AllWorkingTests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 326277F0288BC219009A0508 /* AllWorkingTests.xctestplan */; };
32637ED41E5B00400011E20D /* MXDeviceList.h in Headers */ = {isa = PBXBuildFile; fileRef = 32637ED21E5B00400011E20D /* MXDeviceList.h */; };
32637ED51E5B00400011E20D /* MXDeviceList.m in Sources */ = {isa = PBXBuildFile; fileRef = 32637ED31E5B00400011E20D /* MXDeviceList.m */; };
3264DB911CEC528D00B99881 /* MXAccountData.h in Headers */ = {isa = PBXBuildFile; fileRef = 3264DB8F1CEC528D00B99881 /* MXAccountData.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -673,6 +675,8 @@
3A23A740256D322C00B9D00F /* MXAes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A23A73D256D322C00B9D00F /* MXAes.m */; };
3A23A741256D322C00B9D00F /* MXAes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A23A73E256D322C00B9D00F /* MXAes.h */; settings = {ATTRIBUTES = (Public, ); }; };
3A23A742256D322C00B9D00F /* MXAes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A23A73E256D322C00B9D00F /* MXAes.h */; settings = {ATTRIBUTES = (Public, ); }; };
3A5787A528982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5787A428982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift */; };
3A5787A628982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5787A428982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift */; };
3A59A49D25A7A16F00DDA1FC /* MXOlmOutboundGroupSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A59A49B25A7A16E00DDA1FC /* MXOlmOutboundGroupSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
3A59A49E25A7A16F00DDA1FC /* MXOlmOutboundGroupSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A59A49B25A7A16E00DDA1FC /* MXOlmOutboundGroupSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
3A59A49F25A7A16F00DDA1FC /* MXOlmOutboundGroupSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A59A49C25A7A16F00DDA1FC /* MXOlmOutboundGroupSession.m */; };
Expand Down Expand Up @@ -2117,6 +2121,7 @@
32618E7020ED2DF500E1D2EA /* MXFilterJSONModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXFilterJSONModel.m; sourceTree = "<group>"; };
32618E7920EFA45B00E1D2EA /* MXRoomMembers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXRoomMembers.h; sourceTree = "<group>"; };
32618E7A20EFA45B00E1D2EA /* MXRoomMembers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXRoomMembers.m; sourceTree = "<group>"; };
326277F0288BC219009A0508 /* AllWorkingTests.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AllWorkingTests.xctestplan; sourceTree = "<group>"; };
32637ED21E5B00400011E20D /* MXDeviceList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXDeviceList.h; sourceTree = "<group>"; };
32637ED31E5B00400011E20D /* MXDeviceList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXDeviceList.m; sourceTree = "<group>"; };
3264DB8F1CEC528D00B99881 /* MXAccountData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXAccountData.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2419,6 +2424,7 @@
3A108E6625826F52005EEBE9 /* MXKeyProviderUnitTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXKeyProviderUnitTests.m; sourceTree = "<group>"; };
3A23A73D256D322C00B9D00F /* MXAes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXAes.m; sourceTree = "<group>"; };
3A23A73E256D322C00B9D00F /* MXAes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXAes.h; sourceTree = "<group>"; };
3A5787A428982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MXBreadcrumbsRoomListDataFetcher.swift; sourceTree = "<group>"; };
3A59A49B25A7A16E00DDA1FC /* MXOlmOutboundGroupSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXOlmOutboundGroupSession.h; sourceTree = "<group>"; };
3A59A49C25A7A16F00DDA1FC /* MXOlmOutboundGroupSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXOlmOutboundGroupSession.m; sourceTree = "<group>"; };
3A59A52725A7B1B000DDA1FC /* MXOutboundSessionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXOutboundSessionInfo.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3742,6 +3748,7 @@
3298ABD42637FA3100E40B06 /* TestPlans */ = {
isa = PBXGroup;
children = (
326277F0288BC219009A0508 /* AllWorkingTests.xctestplan */,
3298ABD52637FA3100E40B06 /* AllTests.xctestplan */,
3209682F26396385005D64ED /* AllTestsWithSanitizers.xctestplan */,
EDC2A0E528369E740039F3D6 /* CryptoTests.xctestplan */,
Expand Down Expand Up @@ -4688,6 +4695,7 @@
EC1165A927107E330089FA56 /* MXSuggestedRoomListDataCache.swift */,
EC0B941D27186C3500B4D440 /* MXRoomListDataSortable.swift */,
EC0B942027186D4600B4D440 /* MXRoomListDataFilterable.swift */,
3A5787A428982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift */,
);
path = Common;
sourceTree = "<group>";
Expand Down Expand Up @@ -5982,6 +5990,7 @@
buildActionMask = 2147483647;
files = (
3298ABD62637FA3100E40B06 /* AllTests.xctestplan in Resources */,
326277F1288BC21A009A0508 /* AllWorkingTests.xctestplan in Resources */,
3209683326396385005D64ED /* UnitTestsWithSanitizers.xctestplan in Resources */,
3298ABDD2637FB1900E40B06 /* UnitTests.xctestplan in Resources */,
3209683126396385005D64ED /* AllTestsWithSanitizers.xctestplan in Resources */,
Expand All @@ -6001,6 +6010,7 @@
buildActionMask = 2147483647;
files = (
3298ABD72637FA3100E40B06 /* AllTests.xctestplan in Resources */,
326277F2288BC21A009A0508 /* AllWorkingTests.xctestplan in Resources */,
3209683426396385005D64ED /* UnitTestsWithSanitizers.xctestplan in Resources */,
3298ABDE2637FB1900E40B06 /* UnitTests.xctestplan in Resources */,
3209683226396385005D64ED /* AllTestsWithSanitizers.xctestplan in Resources */,
Expand Down Expand Up @@ -6141,6 +6151,7 @@
32B76EA520FDE85100B095F6 /* MXRoomMembersCount.m in Sources */,
3AD4F231274B922D003F47FE /* MXRoomAliasAvailabilityChecker.swift in Sources */,
B1710B1F2613D01400A9B429 /* MXSpaceChildrenRequestParameters.swift in Sources */,
3A5787A528982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift in Sources */,
32CEEF4B23B0A8170039BA98 /* MXCrossSigningTools.m in Sources */,
EC8A53A525B1BC77004E0802 /* MXCallInviteEventContent.m in Sources */,
323F877D25546170009E9E67 /* MXBaseProfiler.m in Sources */,
Expand Down Expand Up @@ -6709,6 +6720,7 @@
B16C56E3261D0A9D00604765 /* MXSpaceChildInfo.swift in Sources */,
3AD4F232274B922D003F47FE /* MXRoomAliasAvailabilityChecker.swift in Sources */,
B14EF1D52397E90400758AF0 /* MXEventAnnotation.m in Sources */,
3A5787A628982D4600A0D8A8 /* MXBreadcrumbsRoomListDataFetcher.swift in Sources */,
B14EF1D62397E90400758AF0 /* MXPusher.m in Sources */,
B14EF1D72397E90400758AF0 /* MXMediaLoader.m in Sources */,
32549AF823F2E2790002576B /* MXKeyVerificationReady.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
<TestPlanReference
reference = "container:MatrixSDKTests/TestPlans/CryptoTests.xctestplan">
</TestPlanReference>
<TestPlanReference
reference = "container:MatrixSDKTests/TestPlans/AllWorkingTests.xctestplan">
</TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ public class MXBeaconAggregations: NSObject {

existingBeaconInfoSummary.updateWithBeaconInfo(beaconInfo)
beaconInfoSummary = existingBeaconInfoSummary
} else {
MXLog.error("[MXBeaconAggregations] Fails to find beacon info summary associated to stopped beacon info event id: \(eventId)")
}

} else if let existingBeaconInfoSummary = self.getBeaconInfoSummary(withIdentifier: eventId, inRoomWithId: roomId) {
Expand Down
4 changes: 4 additions & 0 deletions MatrixSDK/Data/MXRoomSummary.m
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,10 @@ - (MXRoomSummaryDataTypes)calculateDataTypes
{
result |= MXRoomSummaryDataTypesConferenceUser;
}
if (self.hasAnyNotification)
{
result |= MXRoomSummaryDataTypesUnread;
}

return result;
}
Expand Down
3 changes: 2 additions & 1 deletion MatrixSDK/Data/MXRoomSummaryDataTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ typedef NS_OPTIONS(NSInteger, MXRoomSummaryDataTypes)
MXRoomSummaryDataTypesServerNotice = 1 << 4,
MXRoomSummaryDataTypesHidden = 1 << 5,
MXRoomSummaryDataTypesSpace = 1 << 6,
MXRoomSummaryDataTypesConferenceUser = 1 << 7
MXRoomSummaryDataTypesConferenceUser = 1 << 7,
MXRoomSummaryDataTypesUnread = 1 << 8
};

#endif /* MXRoomSummaryDataTypes_h */
Loading

0 comments on commit 7a69ef4

Please sign in to comment.