Merge branch 'andbible' into 'master'

And Bible: update for latest version and new srclib JSword

The issue (https://github.com/mjdenham/and-bible/issues/21) is not officially solved, but mmseg4j is available via Maven Central now. Thus we are able to build the latest version now.

See merge request !917

metadata/net.bible.android.activity.txt

@@ -53,11 +53,20 @@ Build:2.1.1,138
     prebuild=mv libs/android-support-v4.jar $$Support$$/libs && \
         rm build.xml
 
-Build:2.1.8,145
-    disable=wait for issue to be solved - https://github.com/mjdenham/and-bible/issues/21
-    commit=build-02.01.08
+Build:2.2.2,166
+    commit=build-02.02.02
     subdir=AndBible
+    srclibs=JSword@d7ad5ef
     gradle=yes
+    rm=AndBible/libs,AndBible/libs-src
+    init=sed -i "/android {/a compileOptions {\nsourceCompatibility JavaVersion.VERSION_1_7\ntargetCompatibility JavaVersion.VERSION_1_7\n}" build.gradle
+    prebuild=cp -r ../jsword-tweaks/src/main/. $$JSword$$/src/main && \
+        sed -i "/<repositories>/,/<\/repositories>/d" $$JSword$$/pom.xml && \
+        sed -i "/<dependencies>/a <dependency><groupId>com.chenlb.mmseg4j</groupId><artifactId>mmseg4j-all</artifactId><version>1.8.6</version></dependency>" $$JSword$$/pom.xml
+    build=pushd $$JSword$$ && \
+        $$MVN3$$ package -Dmaven.test.skip=true && \
+        popd && \
+        cp $$JSword$$/target/jsword-*.jar libs/jsword.jar
 
 Auto Update Mode:None
 Update Check Mode:Tags

srclibs/JSword.txt

@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/crosswire/jsword.git
+