From 137b3d81fbcf509da7dd56cd52950a334063671c Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Sun, 30 Oct 2016 23:14:19 -0700
Subject: [PATCH] Fixes JNI file not being copied to output directory for
 integration tests (#308)

---
 wpilibjIntegrationTests/build.gradle | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/wpilibjIntegrationTests/build.gradle b/wpilibjIntegrationTests/build.gradle
index e532825402..3332410bfb 100644
--- a/wpilibjIntegrationTests/build.gradle
+++ b/wpilibjIntegrationTests/build.gradle
@@ -25,26 +25,28 @@ dependencies {
     compile 'org.apache.ant:ant-junit:1.9.4'
 }
 
-compileJava.dependsOn tasks.getByPath(':wpilibj:testClasses')
-
 build.dependsOn shadowJar
 
 def nativeDirectory = "$buildDir/nativelibraries"
 
-defineNetworkTablesProperties()
-
 clean {
     delete nativeDirectory
 }
 
-task copyNativeLibraries(type: Copy) {
+task copyIntegrationLibraries(type: Copy) {
     description = 'Copies all native libraries to an easy to find folder'
     group = 'WPILib'
     dependsOn shadowJar
-    dependsOn wpilibj.wpilibjNativeLibraries
+    dependsOn ':hal:build'
+    dependsOn ':wpilibj:build'
 
-    from zipTree(wpilibj.wpilibjNativeLibraries.archivePath)
-    include '*.so'
+    project(':wpilibj').model {
+        binaries {
+            withType(SharedLibraryBinarySpec) { spec ->
+                from(spec.sharedLibraryFile)
+            }
+        }
+    }
 
     project(':hal').model {
         binaries {
@@ -64,4 +66,6 @@ task copyNativeLibraries(type: Copy) {
     into nativeDirectory
 }
 
-build.dependsOn copyNativeLibraries
+compileJava.dependsOn tasks.getByPath(':wpilibj:testClasses')
+
+build.dependsOn copyIntegrationLibraries