Skip to content

Commit

Permalink
Merge pull request #71 from blair-robot-project/yaml
Browse files Browse the repository at this point in the history
Yaml
  • Loading branch information
Noah Gleason authored Jun 28, 2017
2 parents c0a0008 + 772d29b commit 1a52c46
Show file tree
Hide file tree
Showing 149 changed files with 5,051 additions and 2,738 deletions.
62 changes: 15 additions & 47 deletions RoboRIO/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ plugins {
id "eclipse"
id "idea"
id "jaci.openrio.gradle.GradleRIO" version "2017.1.5"
id "com.google.protobuf" version "0.8.1"
}

group 'org.usfirst.frc.team449.robot2017'
Expand All @@ -21,56 +20,21 @@ repositories {
}

dependencies {
compile 'com.google.protobuf:protobuf-java:3.0.0'
compile 'io.grpc:grpc-stub:1.0.0-pre2'
compile 'io.grpc:grpc-protobuf:1.0.0-pre2'
compile 'com.github.blair-robot-project:449-central-repo:v4.0.0-WPILib2017'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.0.pr3'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.0.pr3'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.0.pr3'
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.0.pr3'
//com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.0.pr3
compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: '2.9.0.pr3'
compile 'org.jetbrains:annotations:13.0'
compile wpilib()
compile talonSrx()
compile fileTree(dir: "lib", include: "*.jar")
compile navx()
}



/* Protobuf stuff */

protobuf {
generatedFilesBaseDir = "$projectDir/gen"
protoc {
// The artifact spec for the Protobuf Compiler
artifact = 'com.google.protobuf:protoc:3.0.0'
}
plugins {
// Optional: an artifact spec for a protoc plugin, with "grpc" as
// the identifier, which can be referred to in the "plugins"
// container of the "generateProtoTasks" closure.
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.0.0-pre2'
}
}
generateProtoTasks {
ofSourceSet('main')*.plugins {
// Apply the "grpc" plugin whose spec is defined above, without
// options. Note the braces cannot be omitted, otherwise the
// plugin will not be added. This is because of the implicit way
// NamedDomainObjectContainer binds the methods.
grpc {}
}
}
}

/* Utils */
clean {
delete protobuf.generatedFilesBaseDir
}

idea {
module {
sourceDirs += file("${protobuf.generatedFilesBaseDir}/main/java")
}
}


task convertFiles {
doLast {
fileTree("src/main/resources").matching { include "*.txt" }.each { aFile ->
Expand Down Expand Up @@ -136,4 +100,8 @@ task genJavadoc(type: Jar, dependsOn: javadoc) {

artifacts {
archives genJavadoc
}

compileJava {
options.compilerArgs << '-parameters'
}
Binary file removed RoboRIO/lib/CTRLib-javadoc.jar
Binary file not shown.
Binary file removed RoboRIO/lib/CTRLib.jar
Binary file not shown.
Binary file added RoboRIO/lib/annotations-java8.jar
Binary file not shown.
Binary file removed RoboRIO/lib/navx_frc.jar
Binary file not shown.
Loading

0 comments on commit 1a52c46

Please sign in to comment.