From 78aa35bf53ee28ca61ccf778255d8c6523760027 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sat, 30 Nov 2013 15:43:18 +0000 Subject: [PATCH] Update Bitcoin (de.schildbach.wallet) to 3.27 (148) --- metadata/de.schildbach.wallet.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt index 9fc2435fd5..98f21125aa 100644 --- a/metadata/de.schildbach.wallet.txt +++ b/metadata/de.schildbach.wallet.txt @@ -133,14 +133,14 @@ Build:3.22,143 rm -rf ../market/ && sed -i '/sample-integration-android/d' ../pom.xml build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml -Build:3.24,145 - commit=809f71ff9d70 +Build:3.27,148 + commit=5787167f05b8 subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet@v0.10.3 - prebuild=cp -r $$BitcoinJWallet$$/ . && \ - rm -rf ../market/ && sed -i '/sample-integration-android/d' ../pom.xml - build=$$MVN3$$ clean install -dskipTests -f BitcoinJWallet/pom.xml + rm=market/ + srclibs=BitcoinJWallet-origin@v0.10.3 + prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet + build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml Maintainer Notes: See wallet/{README,CHANGES} or git log for info about what BitcoinJ tag to use. @@ -150,6 +150,10 @@ Ensure the developer has remembered to update name/icon in prod branch (as did not happen with 3.23, which appears to be why it was quickly replaced with 3.24. (For the same reason, there is no 3.24_test) +Note also that the 'prod:' commits seem to disappear, as if the developer is +removing them and force-pushing the branch. We need to take an alternative +approach to building this in future. + Update the _test app as well. .