#256 adding the forge adapter to the dist build

osmdroid · Mar 13, 2016 · 4440883 · 4440883
1 parent 1d5f426
commit 4440883
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 5 deletions.
diff --git a/osmdroid-dist/pom.xml b/osmdroid-dist/pom.xml
@@ -11,6 +11,13 @@
 	<!-- defined just to get the build order correct -->
 	<dependencies>
 
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<version>${project.version}</version>
+			<artifactId>OpenStreetMapViewer-Forge</artifactId>
+			<type>apk</type>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
@@ -35,18 +42,32 @@
 			<artifactId>osmdroid-third-party</artifactId>
 			<type>aar</type>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<version>${project.version}</version>
+			<artifactId>osmdroid-mapsforge</artifactId>
+			<type>aar</type>
+		</dependency>
+
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
 			<artifactId>osmdroid-packager</artifactId>
 			<type>jar</type>
+			<classifier>jar-with-dependencies</classifier>
 		</dependency>
 
 
 
 
 
-
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<version>${project.version}</version>
+			<artifactId>OpenStreetMapViewer-Forge</artifactId>
+			<classifier>sources</classifier>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
@@ -71,6 +92,12 @@
 			<artifactId>osmdroid-third-party</artifactId>
 			<classifier>sources</classifier>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<version>${project.version}</version>
+			<artifactId>osmdroid-mapsforge</artifactId>
+			<classifier>sources</classifier>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
@@ -79,7 +106,12 @@
 		</dependency>
 
 
-
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<version>${project.version}</version>
+			<artifactId>OpenStreetMapViewer-Forge</artifactId>
+			<classifier>javadoc</classifier>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
@@ -105,6 +137,12 @@
 			<artifactId>osmdroid-third-party</artifactId>
 			<classifier>javadoc</classifier>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<version>${project.version}</version>
+			<artifactId>osmdroid-mapsforge</artifactId>
+			<classifier>javadoc</classifier>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>

diff --git a/osmdroid-dist/src/main/assembly/assembly.xml b/osmdroid-dist/src/main/assembly/assembly.xml
@@ -23,10 +23,12 @@ language governing permissions and * limitations under the License. * */ -->
 
 				<include>org.osmdroid:osmdroid-android:aar</include>
 				<include>org.osmdroid:osmdroid-third-party:aar</include>
-				<include>org.osmdroid:osmdroid-packager:jar</include>
+				<include>org.osmdroid:osmdroid-mapsforge:aar</include>
+				<include>org.osmdroid:osmdroid-packager:jar:jar-with-dependencies</include>
 
 				<include>org.osmdroid:OpenStreetMapViewer:apk</include>
 				<include>org.osmdroid:GoogleWrapperSample:apk</include>
+				<include>org.osmdroid:OpenStreetMapViewer-Forge:apk</include>
 			</includes>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useProjectAttachments>false</useProjectAttachments>
@@ -44,11 +46,13 @@ language governing permissions and * limitations under the License. * */ -->
 			<includes>
 
 				<include>org.osmdroid:osmdroid-android:jar:sources</include>
+				<include>org.osmdroid:osmdroid-mapsforge:jar:sources</include>
 				<include>org.osmdroid:osmdroid-third-party:jar:sources</include>
 				<include>org.osmdroid:osmdroid-packager:jar:sources</include>
 
 				<include>org.osmdroid:OpenStreetMapViewer:jar:sources</include>
 				<include>org.osmdroid:GoogleWrapperSample:jar:sources</include>
+				<include>org.osmdroid:OpenStreetMapViewer-Forge:jar:sources</include>
 			</includes>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useProjectAttachments>false</useProjectAttachments>
@@ -67,9 +71,11 @@ language governing permissions and * limitations under the License. * */ -->
 				<include>org.osmdroid:osmdroid-android:jar:javadoc</include>
 				<include>org.osmdroid:osmdroid-third-party:jar:javadoc</include>
 				<include>org.osmdroid:osmdroid-packager:jar:javadoc</include>
+				<include>org.osmdroid:osmdroid-mapsforge:jar:javadoc</include>
 
 				<include>org.osmdroid:OpenStreetMapViewer:jar:javadoc</include>
 				<include>org.osmdroid:GoogleWrapperSample:jar:javadoc</include>
+				<include>org.osmdroid:OpenStreetMapViewer-Forge:jar:javadoc</include>
 			</includes>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useProjectAttachments>false</useProjectAttachments>

diff --git a/pom.xml b/pom.xml
@@ -216,8 +216,8 @@
 		    <module>osmdroid-third-party</module>
 		    <module>OpenStreetMapViewer</module>
 		    <module>osmdroid-mapsforge</module>
-            <module>osmdroid-forge-app</module>
-            <module>GoogleWrapperSample</module>
+		    <module>osmdroid-forge-app</module>
+		    <module>GoogleWrapperSample</module>
 		    <module>OSMMapTilePackager</module>
 		    <module>osmdroid-android-it</module>
 		</modules>
@@ -230,6 +230,8 @@
 		    <module>osmdroid-third-party</module>
 		    <module>OpenStreetMapViewer</module>
 		    <module>GoogleWrapperSample</module>
+		    <module>osmdroid-mapsforge</module>
+		    <module>osmdroid-forge-app</module>
 		    <module>OSMMapTilePackager</module>
 		    <module>osmdroid-android-it</module>
 		    <module>osmdroid-dist</module>