Skip to content

Commit 6ef7b2d

Browse files
authored
Merge pull request #63 from strykeforce/pdm-graphable
Add Deadeye and PDP measurable item
2 parents 7770188 + 98a227d commit 6ef7b2d

File tree

19 files changed

+385
-470
lines changed

19 files changed

+385
-470
lines changed

build.gradle

Lines changed: 76 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,93 @@
11
buildscript {
2-
repositories {
3-
jcenter()
4-
maven { url "https://plugins.gradle.org/m2/" }
5-
}
6-
dependencies {
7-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
8-
classpath "edu.wpi.first:GradleRIO:2019.4.1"
9-
classpath "com.diffplug.spotless:spotless-plugin-gradle:3.24.2"
10-
}
2+
ext {
3+
kotlinVersion = '1.3.60'
4+
moshiVersion = '1.8.0'
5+
jettyVersion = '9.4.19.v20190610'
6+
okhttpVersion = '3.12.5'
7+
slf4jVersion = '1.7.28'
8+
logbackVersion = '1.2.3'
9+
kotlinLoggingVersion = '1.7.6'
10+
dokkaVersion = '0.9.18'
11+
junitVersion = '5.+'
12+
jsonAssert = '1.+'
13+
assertJVersion = '3.+'
14+
mockitoVersion = '2.+'
15+
gradleRioVersion = '2019.4.1'
16+
bintrayVersion = '1.+'
17+
spotlessVersion = '3.+'
18+
wpiVersion = '2019.4.1'
19+
}
20+
repositories {
21+
jcenter()
22+
maven { url "https://plugins.gradle.org/m2/" }
23+
}
24+
dependencies {
25+
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayVersion"
26+
classpath "edu.wpi.first:GradleRIO:$gradleRioVersion"
27+
classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
28+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
29+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
30+
}
1131
}
1232

33+
// applies to all sub-projects
1334
configure(subprojects) {
14-
group = 'org.strykeforce.thirdcoast'
15-
version = '19.4.1'
35+
group = 'org.strykeforce.thirdcoast'
36+
version = '19.5.0'
1637

17-
apply plugin: 'java-library'
18-
apply plugin: 'idea'
38+
apply plugin: 'java-library'
39+
apply plugin: 'idea'
1940

20-
repositories {
21-
jcenter()
22-
}
41+
sourceCompatibility = 11
2342

24-
dependencies {
25-
implementation 'org.slf4j:slf4j-api:1.7.25'
43+
repositories {
44+
jcenter()
45+
}
2646

27-
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
47+
dependencies {
48+
implementation "org.slf4j:slf4j-api:$slf4jVersion"
2849

29-
// Testing
30-
testImplementation "org.junit.jupiter:junit-jupiter-params:5.+"
31-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.+"
32-
testImplementation "org.assertj:assertj-core:3.+"
33-
testImplementation "org.mockito:mockito-junit-jupiter:2.+"
34-
testRuntime "org.junit.jupiter:junit-jupiter-engine:5.+"
35-
testRuntime 'ch.qos.logback:logback-classic:1.2.3'
36-
}
50+
// Testing
51+
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
52+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
53+
testImplementation "org.assertj:assertj-core:$assertJVersion"
54+
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
55+
testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
56+
testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
57+
}
3758

38-
idea {
39-
module {
40-
downloadJavadoc = true
41-
downloadSources = true
42-
sourceDirs += files('build/generated/source/kaptKotlin/main')
43-
generatedSourceDirs += files('build/generated/source/kaptKotlin/main')
44-
}
59+
idea {
60+
module {
61+
downloadJavadoc = true
62+
downloadSources = true
4563
}
64+
}
4665

47-
test {
48-
useJUnitPlatform()
49-
}
66+
test {
67+
useJUnitPlatform()
68+
}
5069
}
5170

71+
// applies to all sub-projects except for deadeye
5272
configure(subprojects - project(":deadeye")) {
53-
apply plugin: "edu.wpi.first.GradleRIO"
73+
apply plugin: "edu.wpi.first.GradleRIO"
5474

55-
dependencies {
56-
compile wpi.deps.wpilib()
57-
compile wpi.deps.vendor.java()
58-
}
75+
dependencies {
76+
implementation wpi.deps.wpilib()
77+
implementation wpi.deps.vendor.java()
78+
}
79+
}
80+
81+
// applies to all Kotlin sub-projects
82+
configure(subprojects - project(":swerve")) {
83+
apply plugin: "kotlin"
84+
apply plugin: "kotlin-kapt"
85+
apply plugin: 'org.jetbrains.dokka'
86+
87+
dependencies {
88+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
89+
implementation "io.github.microutils:kotlin-logging:$kotlinLoggingVersion"
90+
implementation "com.squareup.moshi:moshi:$moshiVersion"
91+
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
92+
}
5993
}

deadeye/build.gradle

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
1-
apply plugin: 'com.diffplug.gradle.spotless'
2-
3-
sourceCompatibility = 11
4-
5-
dependencies {
6-
7-
// https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava
8-
implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.4'
9-
10-
// https://mvnrepository.com/artifact/com.jakewharton.rxrelay2/rxrelay
11-
implementation group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: '2.1.0'
12-
13-
implementation 'javax.inject:javax.inject:1'
14-
}
15-
16-
task javadocJar(type: Jar, dependsOn: javadoc) {
17-
classifier = 'javadoc'
18-
from javadoc.destinationDir
1+
repositories {
2+
maven { url = "http://first.wpi.edu/FRC/roborio/maven/release" }
193
}
204

21-
spotless {
22-
java {
23-
googleJavaFormat()
24-
}
5+
dependencies {
6+
implementation("edu.wpi.first.ntcore:ntcore-java:$wpiVersion")
257
}
26-
27-
apply from: "${rootDir}/gradle/publish.gradle" // needs to come after javadocJar
8+
//
9+
//task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
10+
// includes = ['packages.md']
11+
// outputDirectory = javadoc.destinationDir
12+
// reportUndocumented = false
13+
//}
14+
//
15+
//
16+
//task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
17+
// classifier = 'javadoc'
18+
// from javadoc.destinationDir
19+
//}
20+
//
21+
//
22+
//apply from: "${rootDir}/gradle/publish.gradle" // needs to come after javadocJar
2823

deadeye/packages.md

Whitespace-only changes.

deadeye/src/main/java/org/strykeforce/thirdcoast/deadeye/ConnectionEvent.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

deadeye/src/main/java/org/strykeforce/thirdcoast/deadeye/DeadeyeMessage.java

Lines changed: 0 additions & 71 deletions
This file was deleted.

deadeye/src/main/java/org/strykeforce/thirdcoast/deadeye/DeadeyeService.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

deadeye/src/main/java/org/strykeforce/thirdcoast/deadeye/Debug.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)