From 2f16661a64c858802c2e23a6fb65b96f25a1ff58 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Tue, 24 Sep 2019 19:29:16 -0400 Subject: [PATCH] produce a fat jar --- README.md | 4 ++-- build.gradle | 39 +++++++++++++++++++++------------------ settings.gradle | 2 +- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 2efb8e0..f06072e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ https://github.com/madhephaestus/SimplePacketComs/blob/master/README.md # How To add new commands to This Application -To add your own custom command start with the default code and modify it by adding a custom command. Your new command needs a unique packet command ID, any 32 bit unsigned integer is valid. +To add your own custom command start with the default code and modify it by adding a custom command. Your new command needs a unique packet command ID, any 32 bit unsigned integer is valid. ## Setup: Set the Command ID @@ -32,7 +32,7 @@ For commands sent as a single send you set the packet into waitToSend mode, then https://github.com/WPIRoboticsEngineering/2001_Field_Controller/blob/2001_Field/src/main/java/edu/wpi/rbe/rbe2001/fieldsimulator/robot/RBE2001Robot.java#L118 -then +then https://github.com/WPIRoboticsEngineering/2001_Field_Controller/blob/2001_Field/src/main/java/edu/wpi/rbe/rbe2001/fieldsimulator/robot/RBE2001Robot.java#L294 diff --git a/build.gradle b/build.gradle index 4c8641b..e1f49bd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,19 @@ -//buildscript { -// repositories { -// maven { -// url "https://plugins.gradle.org/m2/" -// } -// } -// dependencies { -// classpath "com.github.jengelman.gradle.plugins:shadow:5.1.0" -// } -// } -// +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.github.jengelman.gradle.plugins:shadow:5.1.0" + } + } + plugins { id "com.diffplug.gradle.spotless" version "3.14.0" } -//apply plugin: "com.github.johnrengelman.shadow" +apply plugin: "com.github.johnrengelman.shadow" apply plugin: 'java' apply plugin: 'application' apply plugin: 'checkstyle' @@ -30,7 +30,7 @@ repositories { dependencies { implementation "com.neuronrobotics:SimplePacketComsJava:0.10.1" - implementation "com.neuronrobotics:SimplePacketComsJava-HID:0.13.0" + implementation "com.neuronrobotics:SimplePacketComsJava-HID:0.13.0" //implementation project(":SimplePacketComsJava") } @@ -39,7 +39,7 @@ checkstyle { toolVersion = "8.10" configFile = new File(rootDir, "checkstyle.xml") } - + spotless { format 'misc', { target '**/*.gradle', '**/*.md', '**/.gitignore', '**/*.yml', '**/*.sh', '**/*.xml' @@ -50,7 +50,10 @@ spotless { endWithNewline() } } - -task wrapper(type: Wrapper) { - gradleVersion = '5.0' -} +shadowJar { + mainClassName = 'edu.wpi.rbe.rbe2001.fieldsimulator.gui.Main' + baseName = 'FieldControl' + classifier = null + version = '0.14.0' + mergeServiceFiles() + } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 51225f1..b30bbab 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ //include ":SimplePacketComsJava" -//project(":SimplePacketComsJava").projectDir = file("../SimplePacketComsJava") \ No newline at end of file +//project(":SimplePacketComsJava").projectDir = file("../SimplePacketComsJava")