Skip to content

Commit

Permalink
Podfile: by default point to the release Matrix pods
Browse files Browse the repository at this point in the history
Jenkins will use use-dev-pods.sh to build develop version of the app
  • Loading branch information
manuroe committed Jul 26, 2016
1 parent 8c24e3e commit 84aefa8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions use-dev-pods.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 84aefa8

Please sign in to comment.