Skip to content

Commit 70f9ab2

Browse files
committed
Fix integration-android build settings
Conflicts: integration-android/project.properties
1 parent a123444 commit 70f9ab2

File tree

4 files changed

+27
-0
lines changed

4 files changed

+27
-0
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="de.schildbach.wallet.integration.android"
4+
android:versionCode="1"
5+
android:versionName="1.0">
6+
</manifest>

integration-android/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>integration-android</artifactId>
8+
<packaging>apklib</packaging>
89
<version>1.0</version>
910
<name>Bitcoin Integration for Android</name>
1011

@@ -28,6 +29,24 @@
2829

2930
<build>
3031
<sourceDirectory>src</sourceDirectory>
32+
<plugins>
33+
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
35+
<artifactId>maven-source-plugin</artifactId>
36+
</plugin>
37+
<plugin>
38+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
39+
<artifactId>android-maven-plugin</artifactId>
40+
<configuration>
41+
<sdk>
42+
<platform>10</platform>
43+
</sdk>
44+
<!-- Force the generated BuildConfig into target/generated-sources where it is ignored,
45+
see https://code.google.com/p/maven-android-plugin/issues/detail?id=388 -->
46+
<genDirectory>target/generated-sources/r</genDirectory>
47+
</configuration>
48+
</plugin>
49+
</plugins>
3150
</build>
3251

3352
</project>

sample-integration-android/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<groupId>de.schildbach.wallet</groupId>
3131
<artifactId>integration-android</artifactId>
3232
<version>1.0</version>
33+
<type>apklib</type>
3334
</dependency>
3435

3536
</dependencies>

wallet/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<groupId>de.schildbach.wallet</groupId>
6262
<artifactId>integration-android</artifactId>
6363
<version>1.0</version>
64+
<type>apklib</type>
6465
</dependency>
6566

6667
<!-- com.google.zxing.* -->

0 commit comments

Comments
 (0)