mirror of
https://github.com/vector-im/element-ios.git
synced 2024-10-01 16:52:40 +00:00
Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
This commit is contained in:
commit
1b2e458192
5 changed files with 36 additions and 11 deletions
11
CHANGES.md
11
CHANGES.md
|
@ -1,3 +1,14 @@
|
|||
## 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))
|
||||
|
||||
🧱 Build
|
||||
|
||||
- BuildRelease.sh: Add an option to build the ipa from local source code copy
|
||||
|
||||
|
||||
## Changes in 1.6.9 (2021-12-07)
|
||||
|
||||
✨ Features
|
||||
|
|
|
@ -15,5 +15,5 @@
|
|||
//
|
||||
|
||||
// Version
|
||||
MARKETING_VERSION = 1.6.10
|
||||
CURRENT_PROJECT_VERSION = 1.6.10
|
||||
MARKETING_VERSION = 1.6.11
|
||||
CURRENT_PROJECT_VERSION = 1.6.11
|
||||
|
|
2
Podfile
2
Podfile
|
@ -13,7 +13,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.20.13'
|
||||
$matrixSDKVersion = '= 0.20.14'
|
||||
# $matrixSDKVersion = :local
|
||||
# $matrixSDKVersion = { :branch => 'develop'}
|
||||
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
|
||||
|
|
16
Podfile.lock
16
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 (= 0.20.14)
|
||||
- MatrixSDK/JingleCallStack (= 0.20.14)
|
||||
- OLMKit
|
||||
- ReadMoreTextView (~> 3.0.1)
|
||||
- Reusable (~> 4.1)
|
||||
|
@ -199,7 +199,7 @@ SPEC CHECKSUMS:
|
|||
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
|
||||
Logging: beeb016c9c80cf77042d62e83495816847ef108b
|
||||
MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
|
||||
MatrixSDK: 945f082654830d7ae3a6e1e068b6dc22b2eae932
|
||||
MatrixSDK: 31a0d0f01c3be32c808adb78110292ed46e1b669
|
||||
OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
|
||||
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
|
||||
Realm: b6027801398f3743fc222f096faa85281b506e6c
|
||||
|
@ -214,6 +214,6 @@ SPEC CHECKSUMS:
|
|||
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
|
||||
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
|
||||
|
||||
PODFILE CHECKSUM: f58da67b86ec3b34619f1c61a33ce9a8ed35e28f
|
||||
PODFILE CHECKSUM: 12f459fece6a213a48e425c1839aad493f331c80
|
||||
|
||||
COCOAPODS: 1.11.2
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue