#189 OSMTilePackager isn't compiling due to OSMdroid output to AAR, r…

…esolved by using ant to copy the necessary files at build time over and by altering the imports (which were only used for javadocs anyhow). tested and working
osmdroid · Nov 10, 2015 · f3680f7 · f3680f7
1 parent 04aa68d
commit f3680f7
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 19 deletions.
diff --git a/OSMMapTilePackager/pom.xml b/OSMMapTilePackager/pom.xml
@@ -37,13 +37,70 @@
         </dependency>
 
 		<!-- osmdroid dependencies -->
-        <dependency>
-             <groupId>org.osmdroid</groupId>
-             <artifactId>osmdroid-android</artifactId>
-             <version>${project.version}</version>
-        </dependency>
-
+
     </dependencies>
 
+    <build>
+	 <plugins>
+
+	      <plugin>
+		   <groupId>org.apache.maven.plugins</groupId>
+		   <artifactId>maven-antrun-plugin</artifactId>
+		   <version>1.8</version>
+		   <executions>
+			<execution>
+			     <id>copy-dependencies</id>
+			     <phase>process-resources</phase>
+			     <goals>
+				  <goal>run</goal>
+			     </goals>
+			     <configuration>
+				  <target>
+
+
+
+				       <copy tofile="src/main/java/org/osmdroid/tileprovider/util/StreamUtils.java">
+					    <fileset file="../osmdroid-android/src/main/java/org/osmdroid/tileprovider/util/StreamUtils.java"/>
+
+				       </copy>
+				        <copy tofile="src/main/java/org/osmdroid/tileprovider/util/GEMFFile.java">
+					    <fileset file="../osmdroid-android/src/main/java/org/osmdroid/util/GEMFFile.java"/>
+
+				       </copy>
+				        <copy todir="src/main/java/org/osmdroid/api/">
+					    <fileset dir="../osmdroid-android/src/main/java/org/osmdroid/api/"/>
+
+				       </copy>
+
+
+				  </target>
+			     </configuration>
+			</execution>
+		   </executions>
+	      </plugin>
+	      <plugin>
+		   <artifactId>maven-assembly-plugin</artifactId>
+		   <configuration>
+			<archive>
+			     <manifest>
+				  <mainClass>org.osmdroid.mtp.OSMMapTilePackager</mainClass>
+			     </manifest>
+			</archive>
+			<descriptorRefs>
+			     <descriptorRef>jar-with-dependencies</descriptorRef>
+			</descriptorRefs>
+		   </configuration>
+		   <executions>
+			<execution>
+			     <id>make-assembly</id> <!-- this is used for inheritance merges -->
+			     <phase>package</phase> <!-- bind to the packaging phase -->
+			     <goals>
+				  <goal>single</goal>
+			     </goals>
+			</execution>
+		   </executions>
+	      </plugin>
+	 </plugins>
+    </build>
 
 </project>
diff --git a/osmdroid-android/src/main/java/org/osmdroid/api/IMapController.java b/osmdroid-android/src/main/java/org/osmdroid/api/IMapController.java
@@ -1,10 +1,8 @@
 package org.osmdroid.api;
 
-import org.osmdroid.views.MapController;
-
 /**
  * An interface that resembles the Google Maps API MapController class and is implemented by the
- * osmdroid {@link MapController} class.
+ * osmdroid {@link org.osmdroid.views.MapController} class.
  * 
  * @author Neil Boyd
  * 

diff --git a/osmdroid-android/src/main/java/org/osmdroid/api/IMapView.java b/osmdroid-android/src/main/java/org/osmdroid/api/IMapView.java
@@ -1,10 +1,9 @@
 package org.osmdroid.api;
 
-import org.osmdroid.views.MapView;
 
 /**
  * An interface that resembles the Google Maps API MapView class
- * and is implemented by the osmdroid {@link MapView} class.
+ * and is implemented by the osmdroid {@link org.osmdroid.views.MapView} class.
  *
  * @author Neil Boyd
  *

diff --git a/osmdroid-android/src/main/java/org/osmdroid/api/IMyLocationOverlay.java b/osmdroid-android/src/main/java/org/osmdroid/api/IMyLocationOverlay.java
@@ -1,13 +1,11 @@
 package org.osmdroid.api;
 
-import org.osmdroid.views.overlay.MyLocationOverlay;
-
 import android.location.Location;
 import android.os.Bundle;
 
 /**
  * An interface that resembles the Google Maps API MyLocationOverlay class
- * and is implemented by the osmdroid {@link MyLocationOverlay} class.
+ * and is implemented by the osmdroid {@link org.osmdroid.views.overlay.MyLocationOverlay} class.
  *
  * @author Neil Boyd
  *

diff --git a/osmdroid-android/src/main/java/org/osmdroid/api/IProjection.java b/osmdroid-android/src/main/java/org/osmdroid/api/IProjection.java
@@ -1,13 +1,10 @@
 package org.osmdroid.api;
 
-import org.osmdroid.views.MapView;
-import org.osmdroid.views.Projection;
-
 import android.graphics.Point;
 
 /**
  * An interface that resembles the Google Maps API Projection interface and is implemented by the
- * osmdroid {@link Projection} class.
+ * osmdroid {@link  org.osmdroid.views.Projection} class.
  *
  * @author Neil Boyd
  *
@@ -16,7 +13,7 @@ public interface IProjection {
 
 	/**
 	 * Converts the given {@link IGeoPoint} to onscreen pixel coordinates, relative to the top-left
-	 * of the {@link MapView} that provided this Projection.
+	 * of the {@link org.osmdroid.views.MapView} that provided this Projection.
 	 * 
 	 * @param in
 	 *            The latitude/longitude pair to convert.