Merge pull request #63 from strykeforce/pdm-graphable

Add Deadeye and PDP measurable item

build.gradle

@@ -1,59 +1,93 @@
 buildscript {
-    repositories {
-        jcenter()
-        maven { url "https://plugins.gradle.org/m2/" }
-    }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
-        classpath "edu.wpi.first:GradleRIO:2019.4.1"
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.24.2"
-    }
+  ext {
+    kotlinVersion = '1.3.60'
+    moshiVersion = '1.8.0'
+    jettyVersion = '9.4.19.v20190610'
+    okhttpVersion = '3.12.5'
+    slf4jVersion = '1.7.28'
+    logbackVersion = '1.2.3'
+    kotlinLoggingVersion = '1.7.6'
+    dokkaVersion = '0.9.18'
+    junitVersion = '5.+'
+    jsonAssert = '1.+'
+    assertJVersion = '3.+'
+    mockitoVersion = '2.+'
+    gradleRioVersion = '2019.4.1'
+    bintrayVersion = '1.+'
+    spotlessVersion = '3.+'
+    wpiVersion = '2019.4.1'
+  }
+  repositories {
+    jcenter()
+    maven { url "https://plugins.gradle.org/m2/" }
+  }
+  dependencies {
+    classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayVersion"
+    classpath "edu.wpi.first:GradleRIO:$gradleRioVersion"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+    classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
+  }
 }
 
+// applies to all sub-projects
 configure(subprojects) {
-    group = 'org.strykeforce.thirdcoast'
-    version = '19.4.1'
+  group = 'org.strykeforce.thirdcoast'
+  version = '19.5.0'
 
-    apply plugin: 'java-library'
-    apply plugin: 'idea'
+  apply plugin: 'java-library'
+  apply plugin: 'idea'
 
-    repositories {
-        jcenter()
-    }
+  sourceCompatibility = 11
 
-    dependencies {
-        implementation 'org.slf4j:slf4j-api:1.7.25'
+  repositories {
+    jcenter()
+  }
 
-        compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+  dependencies {
+    implementation "org.slf4j:slf4j-api:$slf4jVersion"
 
-        // Testing
-        testImplementation "org.junit.jupiter:junit-jupiter-params:5.+"
-        testImplementation "org.junit.jupiter:junit-jupiter-api:5.+"
-        testImplementation "org.assertj:assertj-core:3.+"
-        testImplementation "org.mockito:mockito-junit-jupiter:2.+"
-        testRuntime "org.junit.jupiter:junit-jupiter-engine:5.+"
-        testRuntime 'ch.qos.logback:logback-classic:1.2.3'
-    }
+    // Testing
+    testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+    testImplementation "org.assertj:assertj-core:$assertJVersion"
+    testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
+    testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
+    testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
+  }
 
-    idea {
-        module {
-            downloadJavadoc = true
-            downloadSources = true
-            sourceDirs += files('build/generated/source/kaptKotlin/main')
-            generatedSourceDirs += files('build/generated/source/kaptKotlin/main')
-        }
+  idea {
+    module {
+      downloadJavadoc = true
+      downloadSources = true
     }
+  }
 
-    test {
-        useJUnitPlatform()
-    }
+  test {
+    useJUnitPlatform()
+  }
 }
 
+// applies to all sub-projects except for deadeye
 configure(subprojects - project(":deadeye")) {
-    apply plugin: "edu.wpi.first.GradleRIO"
+  apply plugin: "edu.wpi.first.GradleRIO"
 
-    dependencies {
-        compile wpi.deps.wpilib()
-        compile wpi.deps.vendor.java()
-    }
+  dependencies {
+    implementation wpi.deps.wpilib()
+    implementation wpi.deps.vendor.java()
+  }
+}
+
+// applies to all Kotlin sub-projects
+configure(subprojects - project(":swerve")) {
+  apply plugin: "kotlin"
+  apply plugin: "kotlin-kapt"
+  apply plugin: 'org.jetbrains.dokka'
+
+  dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "io.github.microutils:kotlin-logging:$kotlinLoggingVersion"
+    implementation "com.squareup.moshi:moshi:$moshiVersion"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
+  }
 }

deadeye/build.gradle

@@ -1,28 +1,23 @@
-apply plugin: 'com.diffplug.gradle.spotless'
-
-sourceCompatibility = 11
-
-dependencies {
-
-    // https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.4'
-
-    // https://mvnrepository.com/artifact/com.jakewharton.rxrelay2/rxrelay
-    implementation group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: '2.1.0'
-
-    implementation 'javax.inject:javax.inject:1'
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
+repositories {
+  maven { url = "http://first.wpi.edu/FRC/roborio/maven/release" }
 }
 
-spotless {
-    java {
-        googleJavaFormat()
-    }
+dependencies {
+  implementation("edu.wpi.first.ntcore:ntcore-java:$wpiVersion")
 }
-
-apply from: "${rootDir}/gradle/publish.gradle" // needs to come after javadocJar
+//
+//task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
+//  includes = ['packages.md']
+//  outputDirectory = javadoc.destinationDir
+//  reportUndocumented = false
+//}
+//
+//
+//task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
+//  classifier = 'javadoc'
+//  from javadoc.destinationDir
+//}
+//
+//
+//apply from: "${rootDir}/gradle/publish.gradle" // needs to come after javadocJar