Merge branch 'update_greenbits_1.97' into 'master'

update GreenBits to 1.97 (97) and ndk to 14b

See merge request !2459
This commit is contained in:
Michel Le Bihan 2017-08-16 13:12:48 +00:00
commit bca7cef0e8
2 changed files with 28 additions and 4 deletions

View file

@ -140,7 +140,19 @@ Build:1.96_testnet,96
build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
ndk=r13b ndk=r13b
Build:1.97_testnet,97
commit=r1.97
subdir=app
gradle=btctestnet
forcevercode=yes
prebuild=sed -i -e 's/enable true/enable false/g' build.gradle && \
sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle
scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/btctestnet/assets/checkpoints
scandelete=app/src/production/assets/checkpoints
build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
ndk=r14b
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:1.96 Current Version:1.97
Current Version Code:196 Current Version Code:197

View file

@ -598,11 +598,23 @@ Build:1.96,96
build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
ndk=r13b ndk=r13b
Build:1.97,97
commit=r1.97
subdir=app
gradle=production
forcevercode=yes
prebuild=sed -i -e 's/enable true/enable false/g' build.gradle && \
sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle
scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/production/assets/checkpoints
scandelete=app/src/btctestnet/assets/checkpoints
build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
ndk=r14b
Maintainer Notes: Maintainer Notes:
Watch prepare_fdroid.sh for changes on new builds. Watch prepare_fdroid.sh for changes on new builds.
. .
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:1.96 Current Version:1.97
Current Version Code:196 Current Version Code:197