Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates Gradle to 2.14 (#78)

Browse Source
This commit is contained in:
Fredric Silberberg
2016-06-30 19:57:29 -07:00
committed by Peter Johnson
parent 4b516de183
commit 384ad57d21
10 changed files with 224 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java.gradle
View File

@@ -27,18 +27,22 @@ jar {
classifier = "$buildPlatform"
dependsOn { classes }
binaries.withType(SharedLibraryBinary) { binary ->
from(file(binary.sharedLibraryFile)) {
into getPlatformPath(binary)
model {
binaries {
withType(SharedLibraryBinarySpec) { binary ->
from(file(binary.sharedLibraryFile)) {
into getPlatformPath(binary)
}
}
}
}
}
project.tasks.whenTaskAdded { task->
project.tasks.whenTaskAdded { task ->
if (isArm) {
if (task.name == 'ntcoreSharedLibrary') jar.dependsOn task
} else {
if (task.name == 'x64NtcoreSharedLibrary' || task.name == 'x86NtcoreSharedLibrary')
if (task.name == 'ntcoreX64SharedLibrary' || task.name == 'ntcoreX86SharedLibrary')
jar.dependsOn task
}
}