From f0c876d0dd0d23b5e25469f586fd2b376aa4b9a0 Mon Sep 17 00:00:00 2001 From: Doug Date: Mon, 13 Mar 2023 16:58:07 +0000 Subject: [PATCH 1/2] changelog.d: Upgrade MatrixSDK version ([v0.26.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.1)). --- Config/AppVersion.xcconfig | 4 ++-- Podfile | 2 +- changelog.d/x-nolink-0.change | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog.d/x-nolink-0.change diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 81b3b3fa5..ef68aae32 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.10.4 -CURRENT_PROJECT_VERSION = 1.10.4 +MARKETING_VERSION = 1.10.5 +CURRENT_PROJECT_VERSION = 1.10.5 diff --git a/Podfile b/Podfile index 0e760e8ca..5e88abe71 100644 --- a/Podfile +++ b/Podfile @@ -16,7 +16,7 @@ use_frameworks! # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI # # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it -$matrixSDKVersion = '= 0.26.0' +$matrixSDKVersion = '= 0.26.1' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change new file mode 100644 index 000000000..2dac0643e --- /dev/null +++ b/changelog.d/x-nolink-0.change @@ -0,0 +1 @@ +Upgrade MatrixSDK version ([v0.26.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.1)). \ No newline at end of file From 9d6b87dcd8b5ebed8b0d65ec519dee5c5175d445 Mon Sep 17 00:00:00 2001 From: Doug Date: Mon, 13 Mar 2023 16:58:07 +0000 Subject: [PATCH 2/2] version++ --- CHANGES.md | 7 +++++++ changelog.d/x-nolink-0.change | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/x-nolink-0.change diff --git a/CHANGES.md b/CHANGES.md index 3dad31015..f2bfcdb39 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 1.10.5 (2023-03-13) + +🙌 Improvements + +- Upgrade MatrixSDK version ([v0.26.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.1)). + + ## Changes in 1.10.4 (2023-03-07) 🙌 Improvements diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change deleted file mode 100644 index 2dac0643e..000000000 --- a/changelog.d/x-nolink-0.change +++ /dev/null @@ -1 +0,0 @@ -Upgrade MatrixSDK version ([v0.26.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.1)). \ No newline at end of file