SpatiaLite natives publishing artifacts, closes mapsforge#849

mgalkin · Jul 2, 2016 · f069472 · f069472
1 parent 02012f0
commit f069472
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 5 deletions.
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -2,9 +2,10 @@
 
 ## New since 0.6.1
 
-- Internal render themes own module [#848](https://github.com/mapsforge/mapsforge/issues/848)
 - Allow resources without location prefixes in render themes [#847](https://github.com/mapsforge/mapsforge/issues/847)
 - Deprecate water tiles rendering [#640](https://github.com/mapsforge/mapsforge/issues/640)
+- Internal render themes own module [#848](https://github.com/mapsforge/mapsforge/issues/848)
+- SpatiaLite natives publishing artifacts [#849](https://github.com/mapsforge/mapsforge/issues/849)
 - Drop of `dev` branch
 - Many other minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/mapsforge/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.6.2)

diff --git a/docs/Integration.md b/docs/Integration.md
@@ -47,7 +47,7 @@ compile 'org.mapsforge:mapsforge-poi-android:0.6.1'
 compile 'org.mapsforge:spatialite-android:0.6.1'
 ```
 
-You'll need also the SpatiaLite native library [files](../spatialite-android/libs).
+You'll need also the SpatiaLite native library [files](../spatialite-android/natives/lib).
 
 #### 2.3 Java
 ```groovy

diff --git a/mapsforge-core/build.gradle b/mapsforge-core/build.gradle
diff --git a/mapsforge-samples-android/build.gradle b/mapsforge-samples-android/build.gradle
@@ -15,7 +15,7 @@ android {
 
     sourceSets {
         main {
-            jniLibs.srcDirs = ['../spatialite-android/libs']
+            jniLibs.srcDirs = ["${rootDir}/spatialite-android/natives/lib"]
         }
         androidTest {
             java.srcDirs = ['src/androidTest']

diff --git a/mapsforge-samples-android/pom.xml b/mapsforge-samples-android/pom.xml
@@ -32,7 +32,7 @@
                     <resourceDirectory>${basedir}/res</resourceDirectory>
                     <assetsDirectory>${basedir}/assets</assetsDirectory>
                     <androidManifestFile>${basedir}/AndroidManifest.xml</androidManifestFile>
-                    <nativeLibrariesDirectory>../spatialite-android/libs</nativeLibrariesDirectory>
+                    <nativeLibrariesDirectory>${rootDirectory}/spatialite-android/natives/lib</nativeLibrariesDirectory>
                 </configuration>
                 <extensions>true</extensions>
             </plugin>

diff --git a/spatialite-android/build.gradle b/spatialite-android/build.gradle
@@ -1,2 +1,11 @@
-dependencies {
+android.libraryVariants.all { variant ->
+    def name = variant.buildType.name
+    if (name.equals("debug")) {
+        print "Skipping debug jar"
+        return; // Skip debug builds.
+    }
+    def task = project.tasks.create "nativesJar${name.capitalize()}", Jar
+    task.classifier = 'natives'
+    task.from('natives')
+    artifacts.add('archives', task);
 }
diff --git a/...te-android/libs/armeabi-v7a/libjsqlite.so → ...oid/natives/lib/armeabi-v7a/libjsqlite.so b/...te-android/libs/armeabi-v7a/libjsqlite.so → ...oid/natives/lib/armeabi-v7a/libjsqlite.so
diff --git a/...ialite-android/libs/armeabi/libjsqlite.so → ...android/natives/lib/armeabi/libjsqlite.so b/...ialite-android/libs/armeabi/libjsqlite.so → ...android/natives/lib/armeabi/libjsqlite.so
diff --git a/spatialite-android/libs/x86/libjsqlite.so → ...ite-android/natives/lib/x86/libjsqlite.so b/spatialite-android/libs/x86/libjsqlite.so → ...ite-android/natives/lib/x86/libjsqlite.so
diff --git a/spatialite-android/pom.xml b/spatialite-android/pom.xml
@@ -29,6 +29,24 @@
                     </dex>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>natives-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>natives</classifier>
+                            <classesDirectory>${basedir}/natives</classesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>