From 2211dc38bb7ee4340896916c588536c9fea7ea97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 8 Oct 2015 19:22:15 +0200
Subject: [PATCH] Fix -PsourceDeps build

We can't do verification since spongycastle isn't imported in the sourceDeps
build, and witness complains about missing libs.
---
 F-Droid/build.gradle | 50 ++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index 765b8d7e8..d041bf1f9 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -49,6 +49,28 @@ if (!hasProperty('sourceDeps')) {
         androidTestCompile 'commons-io:commons-io:2.2'
     }
 
+    // Only do the libraries imported from maven repositories. Our own libraries
+    // (like privileged-api-lib) and the prebuilt jars already checked into the
+    // source code don't need to be here.
+    dependencyVerification {
+        verify = [
+            'com.android.support:support-v4:c62f0d025dafa86f423f48df9185b0d89496adbc5f6a9be5a7c394d84cf91423',
+            'com.android.support:appcompat-v7:9a2355537c2f01cf0b95523605c18606b8d824017e6e94a05c77b0cfc8f21c96',
+            'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a',
+            'org.thoughtcrime.ssl.pinning:AndroidPinning:afa1d74e699257fa75cb109ff29bac50726ef269c6e306bdeffe8223cee06ef4',
+            'com.nostra13.universalimageloader:universal-image-loader:b99382c5536c7325ef8dc0a0fe9a6cad803cf3488942bea7e1cca4db3e5dec43',
+            'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
+            'eu.chainfire:libsuperuser:507f5f9703a7578406e672a96ff038fd8aeefd6e2fcb14dd0daba796239d6eaf',
+            'cc.mvdan.accesspoint:library:dc89a085d6bc40381078b8dd7776b12bde0dbaf8ffbcddb17ec4ebc3edecc7ba',
+            'info.guardianproject.netcipher:netcipher:a8eef6c3bf190e360c44c9364044b8050f0d387418acdae8d7ec78bd105a32a6',
+            'com.madgag.spongycastle:pkix:0d9cca6991f68eb373cfad309d5268c9fc38db5efb5fe00dcccf5c973af1eca1',
+            'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
+            'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
+            'commons-net:commons-net:b35ad597f17a6f221575df2f729a9de8f70390509e047680771e713bad713fb9',
+            'org.openhab.jmdns:jmdns:7a4b34b5606bbd2aff7fdfe629edcb0416fccd367fb59a099f210b9aba4f0bce',
+        ]
+    }
+
 } else {
 
     logger.info "Setting up *source* dependencies for F-Droid (because you passed in the -PsourceDeps argument to gradle while building)."
@@ -58,17 +80,17 @@ if (!hasProperty('sourceDeps')) {
     }
 
     dependencies {
+        compile project(':privileged-api-lib')
+
         compile 'com.android.support:support-v4:22.2.1'
         compile 'com.android.support:appcompat-v7:22.1.1'
         compile 'com.android.support:support-annotations:22.2.1'
 
-        compile project(':privileged-api-lib')
-
         compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
         compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
         compile 'com.google.zxing:core:3.2.1'
         compile 'eu.chainfire:libsuperuser:1.0.0.201504231659'
-        compile 'cc.mvdan.accesspoint:library:0.1.1'
+        compile 'cc.mvdan.accesspoint:library:0.1.3'
         compile 'info.guardianproject.netcipher:netcipher:1.2'
         compile 'commons-net:commons-net:3.3'
         compile 'org.openhab.jmdns:jmdns:3.4.2'
@@ -84,28 +106,6 @@ if (!hasProperty('sourceDeps')) {
 
 }
 
-// Only do the libraries imported from maven repositories. Our own libraries
-// (like privileged-api-lib) and the prebuilt jars already checked into the
-// source code don't need to be here.
-dependencyVerification {
-    verify = [
-        'com.android.support:support-v4:c62f0d025dafa86f423f48df9185b0d89496adbc5f6a9be5a7c394d84cf91423',
-        'com.android.support:appcompat-v7:9a2355537c2f01cf0b95523605c18606b8d824017e6e94a05c77b0cfc8f21c96',
-        'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a',
-        'org.thoughtcrime.ssl.pinning:AndroidPinning:afa1d74e699257fa75cb109ff29bac50726ef269c6e306bdeffe8223cee06ef4',
-        'com.nostra13.universalimageloader:universal-image-loader:b99382c5536c7325ef8dc0a0fe9a6cad803cf3488942bea7e1cca4db3e5dec43',
-        'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
-        'eu.chainfire:libsuperuser:507f5f9703a7578406e672a96ff038fd8aeefd6e2fcb14dd0daba796239d6eaf',
-        'cc.mvdan.accesspoint:library:dc89a085d6bc40381078b8dd7776b12bde0dbaf8ffbcddb17ec4ebc3edecc7ba',
-        'info.guardianproject.netcipher:netcipher:a8eef6c3bf190e360c44c9364044b8050f0d387418acdae8d7ec78bd105a32a6',
-        'com.madgag.spongycastle:pkix:0d9cca6991f68eb373cfad309d5268c9fc38db5efb5fe00dcccf5c973af1eca1',
-        'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
-        'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
-        'commons-net:commons-net:b35ad597f17a6f221575df2f729a9de8f70390509e047680771e713bad713fb9',
-        'org.openhab.jmdns:jmdns:7a4b34b5606bbd2aff7fdfe629edcb0416fccd367fb59a099f210b9aba4f0bce',
-    ]
-}
-
 task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
 
     enabled = project.hasProperty('sourceDeps')