honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #235 from botunge/master 

Change android build to work without having to "hack" the jar
This commit is contained in:
James Agnew 2015-10-01 11:46:08 -04:00
parent 541e6cdcb1 4b2a3e6882
commit bb3738ec76
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-android/.classpath
View File

@ -23,6 +23,5 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="target/hapi-fhir-android-1.2-SNAPSHOT.jar"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

1
hapi-fhir-android/pom.xml
View File

@ -207,7 +207,6 @@
<filter> <filter>
<artifact>ca.uhn.hapi.fhir:hapi-fhir-base</artifact> <artifact>ca.uhn.hapi.fhir:hapi-fhir-base</artifact>
<excludes> <excludes>
<exclude>ca/uhn/fhir/model/dstu/valueset/**</exclude>
<exclude>**/*.java</exclude> <exclude>**/*.java</exclude>
</excludes> </excludes>
</filter> </filter>

2
hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
View File

@ -15,7 +15,7 @@
<directory>${project.basedir}/../hapi-fhir-android/target/</directory> <directory>${project.basedir}/../hapi-fhir-android/target/</directory>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
<includes> <includes>
<include>hapi-fhir-android-${project.version}.jar</include> <include>hapi-fhir-android-${project.version}*.jar</include>
</includes> </includes>
</fileSet> </fileSet>
</fileSets> </fileSets>