Download kiwixlib from jcenter

kiwix · Aug 2, 2017 · 958d217 · 958d217
1 parent b442edb
commit 958d217
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 199 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,13 @@ repositories {
 }
 
 dependencies {
-  // Kiwixlib
-  compile project(":kiwixlib")
+
+  // Get kiwixlib online if it is not populated locally
+  if (file("../kiwixlib/src/main").list().length == 1) {
+    compile 'org.kiwix.kiwixlib:kiwixlib:0.0.4'
+  } else {
+    compile project(':kiwixlib')
+  }
 
   // Storage Devices
   compile 'eu.mhutti1.utils.storage:android-storage-devices:0.6.2'
@@ -126,6 +131,8 @@ if(custom.listFiles()) {
   }
 }
 
+def archs = ['arm64-v8a', 'armeabi', 'mips', 'mips64', 'x86', 'x86_64']
+
 android {
   compileSdkVersion 25
   buildToolsVersion '25.0.2'
@@ -208,16 +215,15 @@ android {
         def parsedJson = new JsonSlurper().parseText(jsonFile.text)
         def sourceFile = file(directory + "/" + parsedJson.zim_file)
         if (parsedJson.embed_zim) {
-
-          // Place content in each lib directory for embeded zims
-          file("../kiwixlib/src/main/jniLibs").eachDir() { folder ->
-            copy {
-              from sourceFile
-              into file(directory + "/jniLibs/" + folder.name)
-              rename { String filename -> "libcontent.so" }
-            }
-          }
-          parsedJson.zim_file = "libcontent.so"
+         // Place content in each lib directory for embeded zims
+          archs.forEach() { archName ->
+           copy {
+             from sourceFile
+             into file(directory + "/jniLibs/" + archName)
+             rename { String filename -> "libcontent.so" }
+           }
+         }
+         parsedJson.zim_file = "libcontent.so"
         }
         // Set custom config from json
         applicationId "$parsedJson.package"
@@ -305,6 +311,10 @@ task wrapper(type: Wrapper) {
 // Testdroid deployment configuration
 def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER')
 
+def findJar(prefix) {
+  configurations.runtime.filter { it.name.startsWith(prefix) }
+}
+
 testdroid {
   authorization "APIKEY"
   apiKey System.getenv('BITBAR_API_KEY')

diff --git a/kiwixlib/.gitignore b/kiwixlib/.gitignore
diff --git a/kiwixlib/libs/.gitkeep b/kiwixlib/libs/.gitkeep
diff --git a/kiwixlib/proguard-rules.pro b/kiwixlib/proguard-rules.pro
diff --git a/kiwixlib/src/main/AndroidManifest.xml b/kiwixlib/src/main/AndroidManifest.xml
@@ -3,10 +3,7 @@
   package="kiwix.org.kiwixlib"
 >
 
-  <application android:allowBackup="true"
-    android:label="@string/app_name"
-    android:supportsRtl="true"
-  >
+  <application>
 
   </application>
 

diff --git a/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwix.java b/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwix.java
diff --git a/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java b/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java
diff --git a/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixInt.java b/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixInt.java
diff --git a/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixString.java b/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixString.java
diff --git a/kiwixlib/src/main/jniLibs/arm64-v8a/libkiwix.so b/kiwixlib/src/main/jniLibs/arm64-v8a/libkiwix.so
diff --git a/kiwixlib/src/main/jniLibs/armeabi/libkiwix.so b/kiwixlib/src/main/jniLibs/armeabi/libkiwix.so
diff --git a/kiwixlib/src/main/jniLibs/mips/libkiwix.so b/kiwixlib/src/main/jniLibs/mips/libkiwix.so
diff --git a/kiwixlib/src/main/jniLibs/mips64/libkiwix.so b/kiwixlib/src/main/jniLibs/mips64/libkiwix.so
diff --git a/kiwixlib/src/main/jniLibs/x86/libkiwix.so b/kiwixlib/src/main/jniLibs/x86/libkiwix.so
diff --git a/kiwixlib/src/main/jniLibs/x86_64/libkiwix.so b/kiwixlib/src/main/jniLibs/x86_64/libkiwix.so
diff --git a/kiwixlib/src/main/res/values/strings.xml b/kiwixlib/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':kiwixlib'
+include ':app', ':kiwixlib'