diff --git a/build.gradle b/build.gradle index 7746b73ebe..5e45b27dc7 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } } dependencies { - classpath 'gradle.plugin.edu.wpi.first:native-utils:1.2.3' + classpath 'gradle.plugin.edu.wpi.first:native-utils:1.2.9' classpath 'gradle.plugin.edu.wpi.first.wpilib.versioning:wpilib-version-plugin:1.6' } } @@ -114,5 +114,5 @@ model { apply from: 'publish.gradle' task wrapper(type: Wrapper) { - gradleVersion = '4.0.1' + gradleVersion = '4.0.2' } diff --git a/config.gradle b/config.gradle index 2acd9d2940..1ac9119c03 100644 --- a/config.gradle +++ b/config.gradle @@ -22,7 +22,7 @@ def mac32BitArg = '-m32' def buildAll = project.hasProperty('buildAll') -def windows64PlatformDetect = { config-> +def windows64PlatformDetect = { def arch = System.getProperty("os.arch") def isWin = OperatingSystem.current().isWindows() if (buildAll) { @@ -32,7 +32,7 @@ def windows64PlatformDetect = { config-> } } -def windows32PlatformDetect = { config-> +def windows32PlatformDetect = { def arch = System.getProperty("os.arch") def isWin = OperatingSystem.current().isWindows() if (buildAll) { @@ -42,7 +42,7 @@ def windows32PlatformDetect = { config-> } } -def linux32IntelPlatformDetect = { config-> +def linux32IntelPlatformDetect = { def arch = System.getProperty("os.arch") def isLinux = OperatingSystem.current().isLinux() def isIntel = (arch == 'amd64' || arch == 'i386') @@ -53,7 +53,7 @@ def linux32IntelPlatformDetect = { config-> } } -def linux64IntelPlatformDetect = { config-> +def linux64IntelPlatformDetect = { def arch = System.getProperty("os.arch") def isLinux = OperatingSystem.current().isLinux() def isIntel = (arch == 'amd64' || arch == 'i386') @@ -64,13 +64,13 @@ def linux64IntelPlatformDetect = { config-> } } -def linuxArmPlatformDetect = { config-> +def linuxArmPlatformDetect = { def arch = System.getProperty("os.arch") def isIntel = (arch == 'amd64' || arch == 'i386') return OperatingSystem.current().isLinux() && !isIntel } -def mac64PlatformDetect = { config-> +def mac64PlatformDetect = { def arch = System.getProperty("os.arch") def isMac = OperatingSystem.current().isMacOsX() if (buildAll) { @@ -80,7 +80,7 @@ def mac64PlatformDetect = { config-> } } -def mac32PlatformDetect = { config-> +def mac32PlatformDetect = { def arch = System.getProperty("os.arch") def isMac = OperatingSystem.current().isMacOsX() if (buildAll) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e28164c1a1..5b9ba2d841 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c038f29a32..53aa334968 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 13 10:56:22 PDT 2017 +#Thu Aug 03 12:38:07 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip diff --git a/publish.gradle b/publish.gradle index 15597457af..fda3296f43 100644 --- a/publish.gradle +++ b/publish.gradle @@ -44,7 +44,7 @@ build.dependsOn outputVersions def baseArtifactId = 'wpiutil' def artifactGroupId = 'edu.wpi.first.wpiutil' -def licenseFile = new File("$rootDir/license.txt") +def licenseFile = file("$rootDir/license.txt") task cppSourcesZip(type: Zip) { destinationDir = outputsFolder