diff --git a/.semver b/.semver index 654455e3a..236b29957 100644 --- a/.semver +++ b/.semver @@ -1,6 +1,6 @@ --- :major: 1 :minor: 0 -:patch: 0 +:patch: 1 :special: '' :metadata: '' diff --git a/Tools/github_release.sh b/Tools/github_release.sh index 4062d8115..e048bd2d1 100755 --- a/Tools/github_release.sh +++ b/Tools/github_release.sh @@ -1,20 +1,21 @@ #!/bin/bash -if [ -z "$TRAVIS_BRANCH" ] ; then - echo "TRAVIS_BRANCH not found. Deploy skipped" - exit 0 +if [ ! -f fabric.properties ] ; then + if [ -z "$TRAVIS_BRANCH" ] ; then + echo "TRAVIS_BRANCH not found. Deploy skipped" + exit 0 + fi + + if [ "$TRAVIS_BRANCH" != "master" ] ; then + echo "TRAVIS_BRANCH is not master. Deploy skipped" + exit 0 + fi + + ./Tools/prepare_crashlytics.sh fi -if [ "$TRAVIS_BRANCH" != "master" ] ; then - echo "TRAVIS_BRANCH is not master. Deploy skipped" - exit 0 -fi - -./Tools/prepare_crashlytics.sh -if [ -f fabric.properties ] ; then - source fabric.properties - ./Fabric.framework/run $apiKey $apiSecret -fi +source fabric.properties +./Fabric.framework/run $apiKey $apiSecret set -x diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 059b6e209..a9ce743a8 100644 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -6817,6 +6817,7 @@ HAVE_SILK, HAVE_SSL, USE_APN_DEV, + HAVE_OPENH264, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -6905,6 +6906,7 @@ VIDEO_ENABLED, HAVE_SILK, HAVE_SSL, + HAVE_OPENH264, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;