From 4a3d8f97c3b1f13e6d62da12cf2da4ab170ad1a6 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 23 Jul 2024 13:39:40 +0200 Subject: [PATCH 1/7] Prepare for new sprint From 35e4b679a94c3322cf1cdf2b96fd170eaa523744 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:06:00 +0100 Subject: [PATCH 2/7] Add UTC timestamps to console logs --- MatrixSDK/Utils/Logs/MXLog.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MatrixSDK/Utils/Logs/MXLog.swift b/MatrixSDK/Utils/Logs/MXLog.swift index c36bbc446d..cc84e44fb8 100644 --- a/MatrixSDK/Utils/Logs/MXLog.swift +++ b/MatrixSDK/Utils/Logs/MXLog.swift @@ -192,7 +192,7 @@ private var logger: SwiftyBeaver.Type = { let consoleDestination = ConsoleDestination() consoleDestination.useNSLog = true consoleDestination.asynchronously = false - consoleDestination.format = "$C$M $X$c" // Format is `Color Message Context`, see https://docs.swiftybeaver.com/article/20-custom-format + consoleDestination.format = "$Z $C$M $X$c" // Format is `Color Message Context`, see https://docs.swiftybeaver.com/article/20-custom-format consoleDestination.levelColor.verbose = "" consoleDestination.levelColor.debug = "" consoleDestination.levelColor.info = "" From 87b36889da79f4751f4e0ab41aad7879dc5670dc Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:09:23 +0100 Subject: [PATCH 3/7] Create 7472.change --- changelog.d/7472.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7472.change diff --git a/changelog.d/7472.change b/changelog.d/7472.change new file mode 100644 index 0000000000..9872b968a0 --- /dev/null +++ b/changelog.d/7472.change @@ -0,0 +1 @@ +Add UTC timestamps to console log lines. From 8c3fcc33cd22967724418b5e1da3b6e38b5fa2fe Mon Sep 17 00:00:00 2001 From: Josh Simmons Date: Fri, 26 Jul 2024 03:03:39 -0700 Subject: [PATCH 4/7] Bring in line with foundation DCO (#1875) * bring in line with foundation DCO * add changelog entry --------- Co-authored-by: Josh Simmons --- CONTRIBUTING.md | 5 ----- changelog.d/pr-1875.doc | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 changelog.d/pr-1875.doc diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea09982691..4e1ff78fab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -155,11 +155,6 @@ include the line in your commit or pull request comment: Signed-off-by: Your Name ``` -We accept contributions under a legally identifiable name, such as -your name on government documentation or common-law names (names -claimed by legitimate usage or repute). Unfortunately, we cannot -accept anonymous contributions at this time. - Git allows you to add this signoff automatically when using the `-s` flag to `git commit`, which uses the name and email set in your `user.name` and `user.email` git configs. diff --git a/changelog.d/pr-1875.doc b/changelog.d/pr-1875.doc new file mode 100644 index 0000000000..521eead789 --- /dev/null +++ b/changelog.d/pr-1875.doc @@ -0,0 +1 @@ +Drop the requirement for "real" or "legally identifiable" name in order to contribute, in line with updated Foundation policy. \ No newline at end of file From e83989fb1fc2bae131ed1810f38cd618a118a691 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 12 Aug 2024 16:46:17 +0300 Subject: [PATCH 5/7] Update format to include the time, Z cannot be applied to NSLog timestamps and doesn't do anything by itself --- MatrixSDK/Utils/Logs/MXLog.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MatrixSDK/Utils/Logs/MXLog.swift b/MatrixSDK/Utils/Logs/MXLog.swift index cc84e44fb8..615d1caa8d 100644 --- a/MatrixSDK/Utils/Logs/MXLog.swift +++ b/MatrixSDK/Utils/Logs/MXLog.swift @@ -192,7 +192,7 @@ private var logger: SwiftyBeaver.Type = { let consoleDestination = ConsoleDestination() consoleDestination.useNSLog = true consoleDestination.asynchronously = false - consoleDestination.format = "$Z $C$M $X$c" // Format is `Color Message Context`, see https://docs.swiftybeaver.com/article/20-custom-format + consoleDestination.format = "$DHH:mm:ss.SSS$d$Z $C$M $X$c" // Format is `Time Color Message Context`, see https://docs.swiftybeaver.com/article/20-custom-format consoleDestination.levelColor.verbose = "" consoleDestination.levelColor.debug = "" consoleDestination.levelColor.info = "" From e1d601a975d86d13df205e84c0117a988a7a5b3e Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:29:24 +0100 Subject: [PATCH 6/7] Use the codecov token. (#1877) * Use the codecov token. * Use codecov v4? --- .github/workflows/ci-integration-tests.yml | 4 +++- .github/workflows/ci-unit-tests.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-integration-tests.yml b/.github/workflows/ci-integration-tests.yml index 81fd1e95a4..590e2b3552 100644 --- a/.github/workflows/ci-integration-tests.yml +++ b/.github/workflows/ci-integration-tests.yml @@ -88,4 +88,6 @@ jobs: # Upload coverage - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index 90a46ffb3d..96e0c752f1 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -64,4 +64,6 @@ jobs: path: build/test/MatrixSDK-macOS.xcresult/ - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} From 5fa780e8da10bf6c789d44e0373f25cd700b7454 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 20 Aug 2024 12:30:25 +0100 Subject: [PATCH 7/7] version++ --- CHANGES.md | 11 +++++++++++ MatrixSDK.podspec | 2 +- MatrixSDK/MatrixSDKVersion.m | 2 +- changelog.d/7472.change | 1 - changelog.d/pr-1875.doc | 1 - 5 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/7472.change delete mode 100644 changelog.d/pr-1875.doc diff --git a/CHANGES.md b/CHANGES.md index 21cc3f8e7b..1121ef1302 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,14 @@ +## Changes in 0.27.13 (2024-08-20) + +🙌 Improvements + +- Add UTC timestamps to console log lines. ([#7472](https://github.com/vector-im/element-ios/issues/7472)) + +📄 Documentation + +- Drop the requirement for "real" or "legally identifiable" name in order to contribute, in line with updated Foundation policy. ([#1875](https://github.com/matrix-org/matrix-ios-sdk/pull/1875)) + + ## Changes in 0.27.12 (2024-07-23) 🙌 Improvements diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec index 8f4f9387ec..3846cacff1 100644 --- a/MatrixSDK.podspec +++ b/MatrixSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MatrixSDK" - s.version = "0.27.12" + s.version = "0.27.13" s.summary = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)" s.description = <<-DESC diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m index 9def75d184..c48d07bcaa 100644 --- a/MatrixSDK/MatrixSDKVersion.m +++ b/MatrixSDK/MatrixSDKVersion.m @@ -16,4 +16,4 @@ #import -NSString *const MatrixSDKVersion = @"0.27.12"; +NSString *const MatrixSDKVersion = @"0.27.13"; diff --git a/changelog.d/7472.change b/changelog.d/7472.change deleted file mode 100644 index 9872b968a0..0000000000 --- a/changelog.d/7472.change +++ /dev/null @@ -1 +0,0 @@ -Add UTC timestamps to console log lines. diff --git a/changelog.d/pr-1875.doc b/changelog.d/pr-1875.doc deleted file mode 100644 index 521eead789..0000000000 --- a/changelog.d/pr-1875.doc +++ /dev/null @@ -1 +0,0 @@ -Drop the requirement for "real" or "legally identifiable" name in order to contribute, in line with updated Foundation policy. \ No newline at end of file