fix wallet builds
This commit is contained in:
parent
9709972d74
commit
529b579c04
|
@ -62,11 +62,9 @@ mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3
|
||||||
mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
|
mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
|
||||||
# Build from prodnet branch which cherry picks some old commits and commits after tags
|
# Build from prodnet branch which cherry picks some old commits and commits after tags
|
||||||
# The git reset (or specific commit instead of a tag) is from the bitcoinj wiki and is used for security
|
# The git reset (or specific commit instead of a tag) is from the bitcoinj wiki and is used for security
|
||||||
Build Version:3.01,121,742241f59df1,maven=yes,\
|
Build Version:3.01,121,742241f59df1,maven=yes,patch=pom.patch,\
|
||||||
bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
|
bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
|
||||||
cp -r $$BitcoinJWallet$$/ . && rm -rf market/ && \
|
cp -r $$BitcoinJWallet$$/ . && rm -rf market/
|
||||||
sed -i 's/0.8/0.8-SNAPSHOT/g' wallet/pom.xml && \
|
|
||||||
sed -i 's/wallet/BitcoinJWallet/g;s/sample-integration-android/wallet/g' pom.xml
|
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
# RM/Tags don't work
|
# RM/Tags don't work
|
||||||
|
|
64
metadata/de.schildbach.wallet/pom.patch
Normal file
64
metadata/de.schildbach.wallet/pom.patch
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
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.01</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index c26e0db..723fa26 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.01</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 9e13ad5..a10247d 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.01</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
@@ -53,7 +53,7 @@
|
||||||
|
<dependency>
|
||||||
|
<groupId>de.schildbach.wallet</groupId>
|
||||||
|
<artifactId>bitcoinj</artifactId>
|
||||||
|
- <version>0.8</version>
|
||||||
|
+ <version>0.8-SNAPSHOT</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- de.schildbach.wallet.integration.android.* -->
|
|
@ -44,11 +44,9 @@ cd $$BitcoinJWallet$$ && $$MVN3$$ install && cd - && \
|
||||||
cd ../integration-android && $$MVN3$$ install && cd ../wallet && \
|
cd ../integration-android && $$MVN3$$ install && cd ../wallet && \
|
||||||
mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
|
mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
|
||||||
mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
|
mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
|
||||||
Build Version:3.01-test,121,v3.01,maven=yes,\
|
Build Version:3.01-test,121,v3.01,maven=yes,patch=pom.patch,\
|
||||||
bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
|
bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
|
||||||
cp -r $$BitcoinJWallet$$/ . && rm -rf market/ && \
|
cp -r $$BitcoinJWallet$$/ . && rm -rf market/
|
||||||
sed -i 's/0.8/0.8-SNAPSHOT/g' wallet/pom.xml && \
|
|
||||||
sed -i 's/wallet/BitcoinJWallet/g;s/sample-integration-android/wallet/g' pom.xml
|
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
# Just use main wallet app
|
# Just use main wallet app
|
||||||
|
|
64
metadata/de.schildbach.wallet_test/pom.patch
Normal file
64
metadata/de.schildbach.wallet_test/pom.patch
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
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.01</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index c26e0db..723fa26 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.01</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 9e13ad5..a10247d 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.01</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
@@ -53,7 +53,7 @@
|
||||||
|
<dependency>
|
||||||
|
<groupId>de.schildbach.wallet</groupId>
|
||||||
|
<artifactId>bitcoinj</artifactId>
|
||||||
|
- <version>0.8</version>
|
||||||
|
+ <version>0.8-SNAPSHOT</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- de.schildbach.wallet.integration.android.* -->
|
Loading…
Reference in a new issue