diff --git a/Podfile b/Podfile index e850104906..34d954e271 100644 --- a/Podfile +++ b/Podfile @@ -8,14 +8,14 @@ target "Vector" do # Different flavours of pods to MatrixKit # The tagged version on which this version of Vector has been built -#pod 'MatrixKit', '~> 0.3.11' +pod 'MatrixKit', '0.3.11' # The lastest release available on the CocoaPods repository #pod 'MatrixKit' # The develop branch version -pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' -pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' +#pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' +#pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' # The one used for developping both MatrixSDK and MatrixKit # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder diff --git a/use-dev-pods.sh b/use-dev-pods.sh new file mode 100755 index 0000000000..d210239f0a --- /dev/null +++ b/use-dev-pods.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This script modifies Podfile in order to use Matrix pods on their develop branch. +# It is intended to be used by Jenkins to build the develop version of the app. + +echo Moving Podfile to develop Matrix pods + +# Podfile.lock will be obsolete reset it +rm -f Podfile.lock + +# Disable the active pods +sed -i '' -E "s!^(pod)(.*MatrixSDK)!#\1\2!g" Podfile +sed -i '' -E "s!^(pod)(.*MatrixKit)!#\1\2!g" Podfile +# And enable the develop ones +sed -i '' -E "s!^(#pod)(.*MatrixSDK)(.*develop)!pod\2\3!g" Podfile +sed -i '' -E "s!^(#pod)(.*MatrixKit)(.*develop)!pod\2\3!g" Podfile