diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt index 1f604bc345..05b7d409e7 100644 --- a/metadata/de.schildbach.wallet.txt +++ b/metadata/de.schildbach.wallet.txt @@ -68,13 +68,25 @@ Build Version:3.04,124,3efa5beb206e,maven=yes,patch=pom.patch,\ bindir=wallet/target,srclibs=BitcoinJWallet@7cb7bfc11c11,prebuild=\ cp -r $$BitcoinJWallet$$/ . && rm -rf market/ +#Successfully built version 3.14 of de.schildbach.wallet +# W/asset (16561): Asset path build/de.schildbach.wallet/wallet/target/library-4.1.0.apk is neither a directory nor file (type=1). +#ERROR: dump failed because assets could not be loaded +#ERROR: Failed to get apk manifest information +# 4.1.0 is the ABS version. Tried replacing 1.6 with 1.7, but no difference +Build Version:3.14,134,!error after building at 5ede628245a8,\ +srclibs=BitcoinJWallet@67b187c4c4c4,\ +patch=pom_134.patch,\ +prebuild=cp -r $$BitcoinJWallet$$/ . && rm -rf market/,\ +maven=yes,\ +bindir=wallet/target + # Build from prodnet branch which cherry picks some old commits and commits after tags # Use specific commit instead of git fetch origin && git checkout origin/prodnet -# See wallet/README for info about which BitcoinJ branch to use +# See wallet/README or git log for info about which BitcoinJ branch/tag to use Auto Update Mode:None # RM/Tags don't work #Update Check Mode:Market Update Check Mode:None -Current Version:3.13 -Current Version Code:133 +Current Version:3.14 +Current Version Code:134 diff --git a/metadata/de.schildbach.wallet/pom_134.patch b/metadata/de.schildbach.wallet/pom_134.patch new file mode 100644 index 0000000000..cfa7c0e6db --- /dev/null +++ b/metadata/de.schildbach.wallet/pom_134.patch @@ -0,0 +1,55 @@ +diff --git a/integration-android/pom.xml b/integration-android/pom.xml +index 161602f..3f49016 100644 +--- a/integration-android/pom.xml ++++ b/integration-android/pom.xml +@@ -10,8 +10,8 @@ + + + de.schildbach.wallet +- base +- 1 ++ wallet-parent ++ 3.14 + + + +diff --git a/pom.xml b/pom.xml +index 37ed82d..ef0c4ff 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -5,15 +5,15 @@ + 4.0.0 + + de.schildbach.wallet +- base +- base +- 1 ++ wallet-parent ++ wallet-parent ++ 3.14 + pom + + +- wallet ++ BitcoinJWallet + integration-android +- sample-integration-android ++ wallet + + + +diff --git a/wallet/pom.xml b/wallet/pom.xml +index 60562e0..d6a2dab 100644 +--- a/wallet/pom.xml ++++ b/wallet/pom.xml +@@ -11,8 +11,8 @@ + + + de.schildbach.wallet +- base +- 1 ++ wallet-parent ++ 3.14 + + + diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt index b18deaefd1..050878a1ef 100644 --- a/metadata/de.schildbach.wallet_test.txt +++ b/metadata/de.schildbach.wallet_test.txt @@ -55,10 +55,12 @@ Build Version:3.04-test,124,v3.04,maven=yes,patch=pom.patch,\ bindir=wallet/target,srclibs=BitcoinJWallet@7cb7bfc11c11,prebuild=\ cp -r $$BitcoinJWallet$$/ . && rm -rf market/ +Build Version:3.14-test,134,!problems building prodnet at v3.14 + # Do other wallet app first Auto Update Mode:None # Just follow main wallet app Update Check Mode:Static -Current Version:3.04-test -Current Version Code:124 +Current Version:3.14-test +Current Version Code:134 diff --git a/metadata/de.schildbach.wallet_test/pom_134.patch b/metadata/de.schildbach.wallet_test/pom_134.patch new file mode 100644 index 0000000000..cfa7c0e6db --- /dev/null +++ b/metadata/de.schildbach.wallet_test/pom_134.patch @@ -0,0 +1,55 @@ +diff --git a/integration-android/pom.xml b/integration-android/pom.xml +index 161602f..3f49016 100644 +--- a/integration-android/pom.xml ++++ b/integration-android/pom.xml +@@ -10,8 +10,8 @@ + + + de.schildbach.wallet +- base +- 1 ++ wallet-parent ++ 3.14 + + + +diff --git a/pom.xml b/pom.xml +index 37ed82d..ef0c4ff 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -5,15 +5,15 @@ + 4.0.0 + + de.schildbach.wallet +- base +- base +- 1 ++ wallet-parent ++ wallet-parent ++ 3.14 + pom + + +- wallet ++ BitcoinJWallet + integration-android +- sample-integration-android ++ wallet + + + +diff --git a/wallet/pom.xml b/wallet/pom.xml +index 60562e0..d6a2dab 100644 +--- a/wallet/pom.xml ++++ b/wallet/pom.xml +@@ -11,8 +11,8 @@ + + + de.schildbach.wallet +- base +- 1 ++ wallet-parent ++ 3.14 + + +