Use zxing-core from source in both ant and gradle

Also, temporarily remove zipsigner from ant until spongycastle is added to it
so that ant builds work

.gitmodules

@@ -32,3 +32,6 @@
 [submodule "extern/nanohttpd"]
 	path = extern/nanohttpd
 	url = https://github.com/eighthave/nanohttpd
+[submodule "extern/zxing-core"]
+	path = extern/zxing-core
+	url = https://gitlab.com/fdroid/zxing-core.git

ant-prepare.sh

@@ -4,6 +4,7 @@ android update lib-project --path extern/UniversalImageLoader/library
 android update lib-project --path extern/AndroidPinning
 android update lib-project --path extern/MemorizingTrustManager
 android update lib-project --path extern/libsuperuser/libsuperuser
+android update lib-project --path extern/zxing-core
 android update project --path . --name F-Droid
 
 { echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null

build.gradle

@@ -16,7 +16,6 @@ FileCollection getAndroidPrebuilt(String apiLevel) {
 }
 
 dependencies {
-	compile files('libs/core-3.0.1.jar')
 	compile project(':support-v4')
 	compile project(':extern:AndroidPinning')
 	compile project(':extern:UniversalImageLoader:library')
@@ -25,6 +24,7 @@ dependencies {
 	compile project(':extern:nanohttpd:core')
 	compile project(':extern:jmdns')
 	compile project(':extern:zipsigner')
+	compile project(':extern:zxing-core')
 }
 
 project(':extern:UniversalImageLoader:library') {

extern/ant-src/kellinwood

@@ -1 +0,0 @@
-../zipsigner/src/main/java/kellinwood

extern/zxing-core

@@ -0,0 +1 @@
+Subproject commit 252a9b6b275397aabb944636f812e8c7057984a7

libs/core-3.0.1.jar.README

@@ -1,17 +0,0 @@
-zxing
------
-
-ZXing ("zebra crossing") is an open-source, multi-format 1D/2D barcode image
-processing library implemented in Java, with ports to other languages.
-
-https://github.com/zxing/zxing
-
-Building zxing from scratch is a massive pain, so we use the official jar.
-The main source repo is SVN, so we couldn't do a git submodule anyway.
-
-The releases should be signed by this key:
-Sean Owen (ZXing) <srowen@gmail.com>
-CE32 85F3 2068 5193 D11F  EA01 F6CE 9695 C931 8406
-
-http://central.maven.org/maven2/com/google/zxing/core/3.0.1/core-3.0.1.jar
-http://central.maven.org/maven2/com/google/zxing/core/3.0.1/core-3.0.1.jar.asc

project.properties

@@ -6,6 +6,7 @@ android.library.reference.1=extern/UniversalImageLoader/library
 android.library.reference.2=extern/MemorizingTrustManager
 android.library.reference.3=extern/AndroidPinning
 android.library.reference.4=extern/libsuperuser/libsuperuser
+android.library.reference.5=extern/zxing-core
 
 # For java libraries, place symlinks in extern/ant-src
 source.dir=src;extern/ant-src

settings.gradle

@@ -9,6 +9,7 @@ include ':extern:spongycastle:core'
 include ':extern:spongycastle:pg'
 include ':extern:spongycastle:pkix'
 include ':extern:spongycastle:prov'
+include ':extern:zxing-core'
 
 include ':support-v4'
 project(':support-v4').projectDir = new File('extern/Support/v4')