[MINOR] v1.3.0

.gitignore

@@ -4,3 +4,7 @@
 !.idea/codeStyles
 **.iml
 build
+src/main/resources/branch.txt
+src/main/resources/buildtime.txt
+src/main/resources/changes.txt
+src/main/resources/commit.txt

README.md

@@ -4,5 +4,5 @@
 
 SERT's robot code for the 2018 PowerUp game.
 
-[travis-img]: https://img.shields.io/travis/SouthEugeneRoboticsTeam/PowerUp-2018.svg?style=flat-square
+[travis-img]: https://img.shields.io/travis/SouthEugeneRoboticsTeam/PowerUp-2018/development.svg?style=flat-square
 [travis-url]: https://travis-ci.org/SouthEugeneRoboticsTeam/PowerUp-2018

build.gradle

@@ -1,32 +1,30 @@
-buildscript {
-    ext.kotlinVersion = '1.2.31'
-    ext.gradleRioVersion = '2018.03.06'
-    ext.sertainVersion = '1.2.0'
-    ext.ktlintVersion = '0.19.0'
-
-    repositories {
-        jcenter()
-        maven { url 'https://plugins.gradle.org/m2/' }
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "gradle.plugin.jaci.openrio.gradle:GradleRIO:$gradleRioVersion"
-    }
+import edu.wpi.first.gradlerio.GradleRIOPlugin
+import edu.wpi.first.gradlerio.frc.FRCJavaArtifact
+import edu.wpi.first.gradlerio.frc.RoboRIO
+import java.text.SimpleDateFormat
+
+plugins {
+    id "java"
+    id "idea"
+    id "org.jetbrains.kotlin.jvm" version "1.2.50"
+    id "edu.wpi.first.GradleRIO" version "2018.06.21"
 }
 
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'jaci.openrio.gradle.GradleRIO'
+ext.kotlinVersion = "1.2.50"
+ext.sertainVersion = "1.2.1"
+ext.ktlintVersion = "0.19.0"
+ext.gsonVersion = "2.8.5"
+
+check.dependsOn "ktlint"
+compileKotlin.dependsOn "versionTxt"
 tasks.whenTaskAdded { task ->
-    if (task.name == 'deploy' || task.name == 'deployMain') task.dependsOn 'assemble'
+    if (task.name == "deploy" || task.name == "deployMain") task.dependsOn "assemble"
 }
-check.dependsOn 'ktlint'
 
 repositories {
     google()
     jcenter()
-    maven { url 'https://jitpack.io' }
+    maven { url "https://jitpack.io" }
 }
 
 configurations {
@@ -37,6 +35,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
 
     compile "org.sert2521.sertain:core:$sertainVersion"
+    compile "com.google.code.gson:gson:$gsonVersion"
 
     compile wpilib()
     compile navx()
@@ -48,46 +47,87 @@ dependencies {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = '1.8'
+    kotlinOptions.jvmTarget = "1.8"
 }
 
 deploy {
     targets {
-        target('roborio', jaci.openrio.gradle.frc.RoboRIO) {
-            team = 2521
-            addresses << '10.25.21.2'
+        target("roborio", RoboRIO) {
+            team = getTeamOrDefault(2521)
         }
     }
 
     artifacts {
-        artifact('main', jaci.openrio.gradle.frc.FRCJavaArtifact) {
-            targets << 'roborio'
+        artifact("main", FRCJavaArtifact) {
+            targets << "roborio"
 
-            debug = false
+            debug = getDebugOrDefault(false)
         }
     }
 }
 
 wpi {
-    wpilibVersion = '2018.4.1'
-    ntcoreVersion = '4.1.0'
-    opencvVersion = '3.2.0'
-    cscoreVersion = '1.3.0'
-    wpiutilVersion = '3.2.0'
+    wpilibVersion = "2018.4.1"
+    ntcoreVersion = "4.1.0"
+    opencvVersion = "3.2.0"
+    cscoreVersion = "1.3.0"
+    wpiutilVersion = "3.2.0"
 
-    ctreVersion = '5.3.1.0'
-    navxVersion = '3.0.346'
+    ctreVersion = "5.5.1.0"
+    navxVersion = "3.0.348"
 
-    shuffleboardVersion = '1.3.1'
+    shuffleboardVersion = "1.3.1"
 }
 
 jar {
     from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-    manifest jaci.openrio.gradle.GradleRIOPlugin.javaManifest('org.sert2521.powerup.Poe')
+    manifest GradleRIOPlugin.javaManifest("org.sert2521.powerup.Poe")
 }
 
 task ktlint(type: JavaExec) {
-    main = 'com.github.shyiko.ktlint.Main'
+    main = "com.github.shyiko.ktlint.Main"
     classpath = configurations.ktlint
-    args 'src/**/*.kt'
+    args "src/**/*.kt"
+}
+
+def getGitHash = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine "git", "rev-parse", "HEAD"
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+def getGitBranch = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine "git", "rev-parse", "--abbrev-ref", "HEAD"
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+def getGitFilesChanged = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine "git", "diff", "--name-only", "HEAD"
+        standardOutput = stdout
+    }
+    return stdout.toString().trim().replace("\n", ", ")
+}
+
+task versionTxt()  {
+    doLast {
+        String resourcesDir = "$projectDir/src/main/resources"
+        new File("$resourcesDir/branch.txt").text = getGitBranch()
+        new File("$resourcesDir/commit.txt").text = getGitHash()
+        new File("$resourcesDir/changes.txt").text = getGitFilesChanged()
+        new File("$resourcesDir/buildtime.txt").text =
+                new SimpleDateFormat("dd-MM-yyyy HH:mm:ss").format(new Date())
+    }
+}
+
+wrapper {
+    gradleVersion = "4.9"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sun Jul 29 10:52:58 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip