Update to 2020 Beta 2 (#61)

Author: prateekma

build.gradle.kts

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm") version "1.3.30" apply false
-    id("edu.wpi.first.GradleRIO") version "2019.4.1" apply false
+    id("edu.wpi.first.GradleRIO") version "2020.1.1-beta-2" apply false
     id("io.gitlab.arturbosch.detekt") version "1.0.0-RC13"
     maven
     `maven-publish`

core/build.gradle.kts

@@ -6,8 +6,12 @@
  * Copyright 2019, Green Hope Falcons
  */
 
+plugins {
+    id("edu.wpi.first.GradleRIO")
+}
+
 dependencies {
-    compile(project(":wpilib2020"))
     compile("org.apache.commons", "commons-math3", "3.6.1")
     compile("com.github.FRCTeam4069:Keigen:1.4.0")
+    wpi.deps.wpilib().forEach { compile(it) }
 }

core/src/main/kotlin/org/ghrobotics/lib/mathematics/twodim/trajectory/FalconTrajectoryConfig.kt

@@ -23,20 +23,9 @@ import org.ghrobotics.lib.mathematics.units.derived.LinearVelocity
  */
 @Suppress("MemberVisibilityCanBePrivate")
 class FalconTrajectoryConfig(
-    val maxVelocity: SIUnit<LinearVelocity>,
-    val maxAcceleration: SIUnit<LinearAcceleration>
+    maxVelocity: SIUnit<LinearVelocity>,
+    maxAcceleration: SIUnit<LinearAcceleration>
 ) : TrajectoryConfig(maxVelocity.value, maxAcceleration.value) {
-
-    /**
-     * Get the starting velocity of the trajectory.
-     */
-    val startVelocity get() = SIUnit<LinearVelocity>(super.getStartVelocityMetersPerSecond())
-
-    /**
-     * Get the ending velocity of the trajectory.
-     */
-    val endVelocity get() = SIUnit<LinearVelocity>(super.getEndVelocityMetersPerSecond())
-
     /**
      * Set the starting velocity of the trajectory.
      * @param startVelocity The start velocity of the trajectory.

settings.gradle.kts

@@ -7,4 +7,4 @@
  */
 
 rootProject.name = "FalconLibrary"
-include("core", "wpi", "vendorCTRE", "vendorREV", "vendorNAVX", "wpilib2020")
+include("core", "wpi", "vendorCTRE", "vendorREV", "vendorNAVX")

vendorNAVX/vendordeps/navx_frc.json

@@ -1,33 +1,34 @@
 {
     "fileName": "navx_frc.json",
     "name": "KauaiLabs_navX_FRC",
-    "version": "3.1.366",
+    "version": "3.1.385",
     "uuid": "cb311d09-36e9-4143-a032-55bb2b94443b",
     "mavenUrls": [
         "https://repo1.maven.org/maven2/"
     ],
-    "jsonUrl": "https://www.kauailabs.com/dist/frc/2019/navx_frc.json",
+    "jsonUrl": "https://www.kauailabs.com/dist/frc/2020/navx_frc.json",
     "javaDependencies": [
         {
             "groupId": "com.kauailabs.navx.frc",
             "artifactId": "navx-java",
-            "version": "3.1.366"
+            "version": "3.1.385"
         }
     ],
     "jniDependencies": [],
     "cppDependencies": [
         {
             "groupId": "com.kauailabs.navx.frc",
             "artifactId": "navx-cpp",
-            "version": "3.1.366",
+            "version": "3.1.385",
             "headerClassifier": "headers",
             "sourcesClassifier": "sources",
             "sharedLibrary": false,
             "libName": "navx_frc",
             "skipInvalidPlatforms": true,
             "binaryPlatforms": [
-                "linuxathena"
+                "linuxathena",
+				"linuxraspbian"
             ]
         }
     ]
-}
+}

vendorREV/vendordeps/REVRobotics.json

@@ -1,7 +1,7 @@
 {
     "fileName": "REVRobotics.json",
     "name": "REVRobotics",
-    "version": "1.1.9",
+    "version": "1.4.33",
     "uuid": "3f48eb8c-50fe-43a6-9cb7-44c86353c4cb",
     "mavenUrls": [
         "http://www.revrobotics.com/content/sw/max/sdk/maven/"
@@ -11,44 +11,53 @@
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "SparkMax-java",
-            "version": "1.1.9"
+            "version": "1.4.33"
         }
     ],
     "jniDependencies": [
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "SparkMax-driver",
-            "version": "1.1.9",
+            "version": "1.4.33",
             "skipInvalidPlatforms": true,
             "isJar": false,
             "validPlatforms": [
-                "linuxathena"
+                "windowsx86-64",
+                "windowsx86",
+                "linuxathena",
+                "linuxraspbian"
             ]
         }
     ],
     "cppDependencies": [
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "SparkMax-cpp",
-            "version": "1.1.9",
-            "libName": "libSparkMax",
+            "version": "1.4.33",
+            "libName": "SparkMax",
             "headerClassifier": "headers",
             "sharedLibrary": false,
             "skipInvalidPlatforms": true,
             "binaryPlatforms": [
-                "linuxathena"
+                "windowsx86-64",
+                "windowsx86",
+                "linuxathena",
+                "linuxraspbian"
             ]
         },
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "SparkMax-driver",
-            "version": "1.1.9",
-            "libName": "libSparkMaxDriver",
+            "version": "1.4.33",
+            "libName": "SparkMaxDriver",
             "headerClassifier": "headers",
             "sharedLibrary": false,
             "skipInvalidPlatforms": true,
             "binaryPlatforms": [
-                "linuxathena"
+                "windowsx86-64",
+                "windowsx86",
+                "linuxathena",
+                "linuxraspbian"
             ]
         }
     ]

wpi/build.gradle.kts

@@ -10,18 +10,7 @@ plugins {
     id("edu.wpi.first.GradleRIO")
 }
 
-repositories {
-//    maven { setUrl("https://maven.woke.engineer/") }
-}
-
 dependencies {
     compile(project(":core"))
     compile("com.github.salomonbrys.kotson", "kotson", "2.5.0")
-    compile("com.github.Oblarg:command-rewrite-jitpack:fb950f049d")
-
-    wpi.deps.wpilib().forEach { compile(it) }
-
-//    wpi.deps.wpilibJni().forEach { nativeZip(it) }
-//    wpi.deps.wpilibDesktopJni().forEach { nativeDesktopZip(it) }
-//    wpi.deps.wpilibJars().forEach { compile(it) }
 }