Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build updates to newest version of plugins and gradle, along with config file (#13)

Browse Source
This commit is contained in:
Thad House
2017-08-03 14:24:02 -07:00
committed by Peter Johnson
parent eb7331f2ab
commit e24db75f08
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -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'
}

14
config.gradle
View File

@@ -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) {

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

2
publish.gradle
View File

@@ -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