From 80c8de7d6907bf2beb2009c9815e69798ff90605 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Fri, 4 Aug 2017 11:46:58 -0700
Subject: [PATCH] Add dependency to jni task to fix 32 bit builds (#216)

Fixes #212
Also forces appveyor to test both 32 and 64 bit correctly.
assemble was removed because it would inadvertently cause a 3rd build.
---
 appveyor.yml | 10 +++++++---
 build.gradle |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 713c47d4a1..3992be1225 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,17 +7,21 @@ build:
   verbosity: detailed
 
 build_script:
-  - gradlew.bat assemble --info -PbuildAll
+  - gradlew.bat tasks
 
 test_script:
 - cmd: >-
     SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0
 
-    gradlew.bat check --info -PbuildAll
+    gradlew.bat clean
+
+    gradlew.bat check --info
 
     SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.8.0
 
-    gradlew.bat check --info -PbuildAll
+    gradlew.bat clean
+
+    gradlew.bat check --info
 
 cache:
   - C:\Users\appveyor\.gradle
diff --git a/build.gradle b/build.gradle
index 213e4a5b32..6e61d3cc1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,7 @@ task nativeTestFilesJar(type: Jar) {
                     from(binary.sharedLibraryFile) {
                         into NativeUtils.getPlatformPath(binary)
                     }
+                    dependsOn binary.buildTask
                 }
             }
         }