simplify wallet BV a little
This commit is contained in:
parent
12b783e623
commit
a0d267c1d9
|
@ -72,11 +72,11 @@ cp -r $$BitcoinJWallet$$/ . && rm -rf market/
|
|||
# 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,\
|
||||
# 4.1.0 is the ABS version
|
||||
Build Version:3.14,134,!error after build at 5ede628245a8,\
|
||||
srclibs=BitcoinJWallet@67b187c4c4c4,\
|
||||
patch=pom_134.patch,\
|
||||
prebuild=cp -r $$BitcoinJWallet$$/ . && rm -rf market/,\
|
||||
build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml,\
|
||||
maven=yes,\
|
||||
bindir=wallet/target
|
||||
|
||||
|
|
|
@ -1,55 +0,0 @@
|
|||
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 @@
|
||||
|
||||
<parent>
|
||||
<groupId>de.schildbach.wallet</groupId>
|
||||
- <artifactId>base</artifactId>
|
||||
- <version>1</version>
|
||||
+ <artifactId>wallet-parent</artifactId>
|
||||
+ <version>3.14</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 37ed82d..ef0c4ff 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -5,15 +5,15 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>de.schildbach.wallet</groupId>
|
||||
- <artifactId>base</artifactId>
|
||||
- <name>base</name>
|
||||
- <version>1</version>
|
||||
+ <artifactId>wallet-parent</artifactId>
|
||||
+ <name>wallet-parent</name>
|
||||
+ <version>3.14</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
- <module>wallet</module>
|
||||
+ <module>BitcoinJWallet</module>
|
||||
<module>integration-android</module>
|
||||
- <module>sample-integration-android</module>
|
||||
+ <module>wallet</module>
|
||||
</modules>
|
||||
|
||||
<build>
|
||||
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 @@
|
||||
|
||||
<parent>
|
||||
<groupId>de.schildbach.wallet</groupId>
|
||||
- <artifactId>base</artifactId>
|
||||
- <version>1</version>
|
||||
+ <artifactId>wallet-parent</artifactId>
|
||||
+ <version>3.14</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
Loading…
Reference in a new issue