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.
wpilibsuite · Aug 4, 2017 · 80c8de7 · 80c8de7
1 parent 7f776de
commit 80c8de7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -55,6 +55,7 @@ task nativeTestFilesJar(type: Jar) {
                     from(binary.sharedLibraryFile) {
                         into NativeUtils.getPlatformPath(binary)
                     }
+                    dependsOn binary.buildTask
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ task nativeTestFilesJar(type: Jar) { @@
                         from(binary.sharedLibraryFile) {
                             into NativeUtils.getPlatformPath(binary)
                         }
+                        dependsOn binary.buildTask
                     }
                 }
             }
@@ Expand Down @@