Add static string that contains toolchain name (#271)

This was still broken in one place, and was broken earlier.

Author: ThadHouse

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/raspbian/RaspbianToolchainPlugin.java

@@ -12,6 +12,8 @@
 
 public class RaspbianToolchainPlugin implements Plugin<Project> {
 
+    public static final String toolchainName = "raspbian";
+
     private RaspbianToolchainExtension raspbianExt;
     private Project project;
 
@@ -23,7 +25,7 @@ public void apply(Project project) {
 
         ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);
 
-        ToolchainDescriptor descriptor = new ToolchainDescriptor("raspbian", "raspianGcc", new ToolchainRegistrar<RaspbianGcc>(RaspbianGcc.class, project));
+        ToolchainDescriptor descriptor = new ToolchainDescriptor(toolchainName, "raspianGcc", new ToolchainRegistrar<RaspbianGcc>(RaspbianGcc.class, project));
         descriptor.setToolchainPlatforms(NativePlatforms.raspbian);
         descriptor.setOptional(true);
         descriptor.getDiscoverers().all((ToolchainDiscoverer disc) -> {

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/roborio/RoboRioToolchainPlugin.java

@@ -12,6 +12,8 @@
 
 public class RoboRioToolchainPlugin implements Plugin<Project> {
 
+    public static final String toolchainName = "roboRio";
+
     private RoboRioToolchainExtension roborioExt;
     private Project project;
 
@@ -23,7 +25,7 @@ public void apply(Project project) {
 
         ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);
 
-        ToolchainDescriptor descriptor = new ToolchainDescriptor("roboRio", "roborioGcc", new ToolchainRegistrar<RoboRioGcc>(RoboRioGcc.class, project));
+        ToolchainDescriptor descriptor = new ToolchainDescriptor(toolchainName, "roborioGcc", new ToolchainRegistrar<RoboRioGcc>(RoboRioGcc.class, project));
         descriptor.setToolchainPlatforms(NativePlatforms.roborio);
         descriptor.setOptional(false);
         descriptor.getDiscoverers().all((ToolchainDiscoverer disc) -> {

src/main/groovy/edu/wpi/first/gradlerio/frc/FRCNativeArtifact.groovy

@@ -3,6 +3,7 @@ package edu.wpi.first.gradlerio.frc
 import com.google.gson.GsonBuilder
 import edu.wpi.first.toolchain.NativePlatforms
 import edu.wpi.first.toolchain.ToolchainExtension
+import edu.wpi.first.toolchain.roborio.RoboRioToolchainPlugin
 import groovy.transform.CompileStatic
 import jaci.gradle.PathUtils
 import jaci.gradle.deploy.artifact.BinaryLibraryArtifact
@@ -131,7 +132,7 @@ class FRCNativeArtifact extends NativeArtifact {
                 def target = ip.host + ":" + debugPort
 //                def toolchainD = project.plugins.getPlugin(WPIToolchainPlugin.class).discoverRoborioToolchain()
 
-                def toolchainD = project.extensions.getByType(ToolchainExtension).getByName('roboRio').discover()
+                def toolchainD = project.extensions.getByType(ToolchainExtension).getByName(RoboRioToolchainPlugin.toolchainName).discover()
                 def gdbpath = toolchainD.gdbFile().get().absolutePath
                 def sysroot = toolchainD.sysroot().orElse(null).absolutePath
 

src/main/groovy/edu/wpi/first/gradlerio/ide/EditorConfigurationTask.groovy

@@ -2,6 +2,7 @@ package edu.wpi.first.gradlerio.ide
 
 import com.google.gson.GsonBuilder
 import edu.wpi.first.toolchain.ToolchainExtension
+import edu.wpi.first.toolchain.roborio.RoboRioToolchainPlugin
 import groovy.transform.CompileStatic
 import jaci.gradle.nativedeps.DelegatedDependencySet
 import org.gradle.api.DefaultTask
@@ -23,7 +24,7 @@ class EditorConfigurationTask extends DefaultTask {
         def cfg = [:]
 
         // Compiler
-        def toolchainD = project.extensions.getByType(ToolchainExtension).getByName('roborio').discover()
+        def toolchainD = project.extensions.getByType(ToolchainExtension).getByName(RoboRioToolchainPlugin.toolchainName).discover()
         def dCompiler = [
             toolchainDir     : toolchainD.rootDir().get().absolutePath,
             gdbPath          : toolchainD.gdbFile().get().absolutePath,