From e500dac036b5ea811a0c7182f071382cd42a25c6 Mon Sep 17 00:00:00 2001
From: keeba <keeba@users.noreply.gitlab.com>
Date: Tue, 11 Aug 2015 04:31:45 +0200
Subject: [PATCH] And Bible: update for latest version and new srclib JSword

---
 metadata/net.bible.android.activity.txt | 15 ++++++++++++---
 srclibs/JSword.txt                      |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 srclibs/JSword.txt

diff --git a/metadata/net.bible.android.activity.txt b/metadata/net.bible.android.activity.txt
index 103916fbec..b7b321415d 100644
--- a/metadata/net.bible.android.activity.txt
+++ b/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
diff --git a/srclibs/JSword.txt b/srclibs/JSword.txt
new file mode 100644
index 0000000000..3d5d1ae2b6
--- /dev/null
+++ b/srclibs/JSword.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/crosswire/jsword.git
+