Updates to make the build script setup easier to use

snobotsim · Jan 20, 2019 · 0206794 · 0206794
1 parent 1877501
commit 0206794
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     compile localGroovy()
     testCompile gradleTestKit()
 
-    compile "edu.wpi.first:GradleRIO:2019.1.1"
+    compile "edu.wpi.first:GradleRIO:2019.2.1"
 }
 
 archivesBaseName = "SnobotSimulatorPlugin"
@@ -47,7 +47,7 @@ publishing {
 
 
 group = "com.snobot.simulator.plugin"
-version = "2019-0.2.0"
+version = "2019-1.0.0"
 
 pluginBundle {
     website = 'https://github.com/pjreiniger/SnobotSimPlugin'

diff --git a/src/main/groovy/com/snobot/simulator/plugin/SnobotSimulatorPlugin.groovy b/src/main/groovy/com/snobot/simulator/plugin/SnobotSimulatorPlugin.groovy
@@ -21,6 +21,7 @@ class SnobotSimulatorPlugin implements Plugin<Project> {
     void apply(Project project) {
         SnobotSimulatorVersionsExtension snobotSimExtension = project.extensions.create("snobotSim", SnobotSimulatorVersionsExtension, project)
 
+        project.configurations.maybeCreate("snobotSimCompile")
         project.configurations.maybeCreate("snobotSimJavaNative")
         project.configurations.maybeCreate("snobotSimCppNative")
 

diff --git a/src/main/groovy/com/snobot/simulator/plugin/SnobotSimulatorVersionExtension.groovy b/src/main/groovy/com/snobot/simulator/plugin/SnobotSimulatorVersionExtension.groovy
@@ -9,7 +9,7 @@ import groovy.transform.CompileStatic
 class SnobotSimulatorVersionsExtension {
 
     String snobotSimVersion = "2019-0.0.1-RC"
-    String snobotSimCtreVersion = "5.12.0_V0_RC"
+    String snobotSimCtreVersion = "5.12.0_V1_RC"
     String jfreechart = "1.0.13"
     String jinput = "2.0.7"
     String log4j = "2.11.0"

diff --git a/src/main/groovy/com/snobot/simulator/plugin/java_sim/RunJavaSnobotSimPlugin.groovy b/src/main/groovy/com/snobot/simulator/plugin/java_sim/RunJavaSnobotSimPlugin.groovy
@@ -19,6 +19,15 @@ class RunJavaSnobotSimPlugin implements Plugin<Project> {
             t.group = "SnobotSimulator"
         }
 
+
+        if(project.sourceSets.findByName("simulatorExtensions") != null) {
+            project.tasks.register("simulatorExtensionJavaJar", Jar) {
+                baseName = "SnobotSimExtensions"
+                from project.sourceSets.simulatorExtensions.output
+            }
+        }
+
+
         project.tasks.withType(Test).configureEach { Test t ->
             t.dependsOn("extractSnobotSimJavaJNI")
         }
@@ -35,8 +44,8 @@ class RunJavaSnobotSimPlugin implements Plugin<Project> {
 
                     task.dependsOn jarTask
 
-                    if(project.tasks.findByName("simulatorExtensionJar")) {
-                        task.dependsOn "simulatorExtensionJar"
+                    if(project.tasks.findByName("simulatorExtensionJavaJar")) {
+                        task.dependsOn "simulatorExtensionJavaJar"
                     }
 
                     task.doLast {
@@ -45,8 +54,8 @@ class RunJavaSnobotSimPlugin implements Plugin<Project> {
                         classpath = addToClasspath(project.configurations.getByName("compile"), classpath)
                         classpath = addToClasspath(project.configurations.getByName("snobotSimCompile"), classpath)
 
-                        if(project.tasks.findByName("simulatorExtensionJar")) {
-                            project.tasks.getByName("simulatorExtensionJar").outputs.files.each {
+                        if(project.tasks.findByName("simulatorExtensionJavaJar")) {
+                            project.tasks.getByName("simulatorExtensionJavaJar").outputs.files.each {
                                 classpath += it.getAbsolutePath() + envDelimiter()
                                 logger.info("Adding custom extension to the classpath: " + it.getAbsolutePath());
                             }