From 25a395cc2527ea12d1f5746f55d47bd5eafba212 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 9 Dec 2021 11:21:19 +0100 Subject: [PATCH 1/7] version++ (Made manually) --- CHANGES.md | 7 +++++++ Podfile | 3 ++- Podfile.lock | 27 ++++++++++++++++++--------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 813f8f297..85ac68ccd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 1.6.10 (2021-12-09) + +🙌 Improvements + +- Upgrade MatrixSDK version ([v0.20.14](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.14)). + + ## Changes in 1.6.9 (2021-12-07) ✨ Features diff --git a/Podfile b/Podfile index 6c868bca4..445189827 100644 --- a/Podfile +++ b/Podfile @@ -13,10 +13,11 @@ 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.20.13' +#$matrixSDKVersion = '= 0.20.14' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } +$matrixSDKVersion = { :specHash => { git: 'git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git', branch: 'advisory-fix-1' } } ######################################## diff --git a/Podfile.lock b/Podfile.lock index d0d2d36bb..703c98123 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -59,16 +59,16 @@ PODS: - MatomoTracker (7.4.1): - MatomoTracker/Core (= 7.4.1) - MatomoTracker/Core (7.4.1) - - MatrixSDK (0.20.13): - - MatrixSDK/Core (= 0.20.13) - - MatrixSDK/Core (0.20.13): + - MatrixSDK (0.20.14): + - MatrixSDK/Core (= 0.20.14) + - MatrixSDK/Core (0.20.14): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - OLMKit (~> 3.2.5) - Realm (= 10.16.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.20.13): + - MatrixSDK/JingleCallStack (0.20.14): - JitsiMeetSDK (= 3.10.2) - MatrixSDK/Core - OLMKit (3.2.5): @@ -117,8 +117,8 @@ DEPENDENCIES: - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - MatomoTracker (~> 7.4.1) - - MatrixSDK (= 0.20.13) - - MatrixSDK/JingleCallStack (= 0.20.13) + - "MatrixSDK (from `git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git`, branch `advisory-fix-1`)" + - "MatrixSDK/JingleCallStack (from `git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git`, branch `advisory-fix-1`)" - OLMKit - ReadMoreTextView (~> 3.0.1) - Reusable (~> 4.1) @@ -158,7 +158,6 @@ SPEC REPOS: - LoggerAPI - Logging - MatomoTracker - - MatrixSDK - OLMKit - ReadMoreTextView - Realm @@ -173,6 +172,16 @@ SPEC REPOS: - zxcvbn-ios - ZXingObjC +EXTERNAL SOURCES: + MatrixSDK: + :branch: advisory-fix-1 + :git: "git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git" + +CHECKOUT OPTIONS: + MatrixSDK: + :commit: 19b13702bd4791d520d7e29de8985fcd7131d3ab + :git: "git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git" + SPEC CHECKSUMS: AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24 @@ -199,7 +208,7 @@ SPEC CHECKSUMS: LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb - MatrixSDK: 945f082654830d7ae3a6e1e068b6dc22b2eae932 + MatrixSDK: 31a0d0f01c3be32c808adb78110292ed46e1b669 OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d Realm: b6027801398f3743fc222f096faa85281b506e6c @@ -214,6 +223,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: f58da67b86ec3b34619f1c61a33ce9a8ed35e28f +PODFILE CHECKSUM: a52cde8eec97b8e5ea377f86721bf9155e35abad COCOAPODS: 1.11.2 From 14a06f9804fcc837fe28cbec317911a1ca956f03 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 9 Dec 2021 13:46:33 +0100 Subject: [PATCH 2/7] BuildRelease.sh: Add an option to build the ipa from local source code copy --- CHANGES.md | 6 +++++- Tools/Release/buildRelease.sh | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 85ac68ccd..d2b81bdf1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,11 @@ 🙌 Improvements -- Upgrade MatrixSDK version ([v0.20.14](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.14)). +- Upgrade MatrixSDK version ([v0.20.14](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.14)) + +🧱 Build + +- BuildRelease.sh: Add an option to build the ipa from local source code copy ## Changes in 1.6.9 (2021-12-07) diff --git a/Tools/Release/buildRelease.sh b/Tools/Release/buildRelease.sh index 6ac02d462..583b00b62 100755 --- a/Tools/Release/buildRelease.sh +++ b/Tools/Release/buildRelease.sh @@ -21,6 +21,8 @@ TAG=$1 BUILD_DIR="build"/$TAG BUILD_NUMBER=$( date +%Y%m%d%H%M%S ) +# Enable this flag to build the ipa from the current local source code. Not git clone +# LOCAL_SOURCE=true if [ -e $BUILD_DIR ]; then echo "Error: Folder ${BUILD_DIR} already exists" @@ -32,7 +34,17 @@ mkdir -p $BUILD_DIR cd $BUILD_DIR REPO_URL=$(git ls-remote --get-url origin) REPO_NAME=$(basename -s .git $REPO_URL) + +if [ "$LOCAL_SOURCE" = true ]; then +echo "Reuse source code of the local copy..." +rm -rf /tmp/$REPO_NAME +cp -R ../../../.. /tmp/$REPO_NAME +mv /tmp/$REPO_NAME . +else +echo "Git clone $REPO_URL with branch/tag $TAG..." git clone $REPO_URL --depth=1 --branch $TAG +fi + cd $REPO_NAME # Fastlane update @@ -44,7 +56,9 @@ bundle update bundle exec fastlane update_plugins # Use appropriated dependencies according to the current branch +if [ "$LOCAL_SOURCE" != true ]; then bundle exec fastlane point_dependencies_to_same_feature +fi # Build bundle exec fastlane app_store build_number:$BUILD_NUMBER git_tag:$TAG From 53f8a732cfe9831058768a5329462d4f718257b1 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 9 Dec 2021 14:18:56 +0100 Subject: [PATCH 3/7] version++ (by hand) --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index d414d01ef..ef94fbbf6 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.6.9 -CURRENT_PROJECT_VERSION = 1.6.9 +MARKETING_VERSION = 1.6.10 +CURRENT_PROJECT_VERSION = 1.6.10 From 2c4607aea28779cef733a2353c9e8b3a5d636d5e Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 14 Dec 2021 08:54:03 +0100 Subject: [PATCH 4/7] Podfile: Use the right SDK version after the security release https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.14 --- Podfile | 3 +-- Podfile.lock | 17 ++++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Podfile b/Podfile index 445189827..f51a72727 100644 --- a/Podfile +++ b/Podfile @@ -13,11 +13,10 @@ 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.20.14' +$matrixSDKVersion = '= 0.20.14' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } -$matrixSDKVersion = { :specHash => { git: 'git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git', branch: 'advisory-fix-1' } } ######################################## diff --git a/Podfile.lock b/Podfile.lock index 703c98123..dcde25ebc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -117,8 +117,8 @@ DEPENDENCIES: - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - MatomoTracker (~> 7.4.1) - - "MatrixSDK (from `git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git`, branch `advisory-fix-1`)" - - "MatrixSDK/JingleCallStack (from `git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git`, branch `advisory-fix-1`)" + - MatrixSDK (= 0.20.14) + - MatrixSDK/JingleCallStack (= 0.20.14) - OLMKit - ReadMoreTextView (~> 3.0.1) - Reusable (~> 4.1) @@ -158,6 +158,7 @@ SPEC REPOS: - LoggerAPI - Logging - MatomoTracker + - MatrixSDK - OLMKit - ReadMoreTextView - Realm @@ -172,16 +173,6 @@ SPEC REPOS: - zxcvbn-ios - ZXingObjC -EXTERNAL SOURCES: - MatrixSDK: - :branch: advisory-fix-1 - :git: "git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git" - -CHECKOUT OPTIONS: - MatrixSDK: - :commit: 19b13702bd4791d520d7e29de8985fcd7131d3ab - :git: "git@github.com:matrix-org/matrix-ios-sdk-ghsa-fxvm-7vhj-wj98.git" - SPEC CHECKSUMS: AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24 @@ -223,6 +214,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: a52cde8eec97b8e5ea377f86721bf9155e35abad +PODFILE CHECKSUM: 12f459fece6a213a48e425c1839aad493f331c80 COCOAPODS: 1.11.2 From f3e8975dca712c0da47bc7a18f92f954c5bda76e Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 14 Dec 2021 09:12:09 +0100 Subject: [PATCH 5/7] version++ --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index d2b81bdf1..1ca6991c8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Changes in 1.6.10 (2021-12-14) + +No significant changes. + + ## Changes in 1.6.10 (2021-12-09) 🙌 Improvements From 6ceade226f6b511457da61811b53683edc9c547a Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 14 Dec 2021 09:15:01 +0100 Subject: [PATCH 6/7] CHANGES: Fix it for merging the security fix for public release --- CHANGES.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1ca6991c8..d2b81bdf1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,3 @@ -## Changes in 1.6.10 (2021-12-14) - -No significant changes. - - ## Changes in 1.6.10 (2021-12-09) 🙌 Improvements From cbda582c85e145f30de944192d939986fb9ef668 Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 14 Dec 2021 10:18:11 +0100 Subject: [PATCH 7/7] finish version++