Remove Choreo (#482)

The Choreo team has requested it be removed from the installer, at least for 2025.

This reverts commit 778914a.

WPILibInstaller-Avalonia/Interfaces/IConfigurationProvider.cs

@@ -16,8 +16,6 @@ public interface IConfigurationProvider
 
         AdvantageScopeConfig AdvantageScopeConfig { get; }
 
-        ChoreoConfig ChoreoConfig { get; }
-
         ElasticConfig ElasticConfig { get; }
 
         VsCodeConfig VsCodeConfig { get; }

WPILibInstaller-Avalonia/ViewModels/InstallPageViewModel.cs

@@ -95,7 +95,6 @@ await ExtractArchive(token, new[] {
                 configurationProvider.JdkConfig.Folder + "/",
                 configurationProvider.UpgradeConfig.Tools.Folder + "/",
                 configurationProvider.AdvantageScopeConfig.Folder + "/",
-                configurationProvider.ChoreoConfig.Folder + "/",
                 configurationProvider.ElasticConfig.Folder + "/",
                 "installUtils/"});
         }

WPILibInstaller-Avalonia/ViewModels/StartPageViewModel.cs

@@ -214,17 +214,6 @@ private async Task<bool> SelectResourceFilesWithFile(string file)
                 }) ?? throw new InvalidOperationException("Not Valid");
             }
 
-            entry = zipArchive.GetEntry("choreoConfig.json");
-
-            using (StreamReader reader = new StreamReader(entry!.Open()))
-            {
-                var configStr = await reader.ReadToEndAsync();
-                ChoreoConfig = JsonConvert.DeserializeObject<ChoreoConfig>(configStr, new JsonSerializerSettings
-                {
-                    MissingMemberHandling = MissingMemberHandling.Error
-                }) ?? throw new InvalidOperationException("Not Valid");
-            }
-
             entry = zipArchive.GetEntry("elasticConfig.json");
 
             using (StreamReader reader = new StreamReader(entry!.Open()))
@@ -436,8 +425,6 @@ public override PageViewModelBase MoveNext()
 
         public AdvantageScopeConfig AdvantageScopeConfig { get; private set; } = null!;
 
-        public ChoreoConfig ChoreoConfig { get; private set; } = null!;
-
         public ElasticConfig ElasticConfig { get; private set; } = null!;
 
         public VsCodeConfig VsCodeConfig { get; private set; } = null!;

build.gradle

@@ -103,7 +103,6 @@ apply from: 'scripts/jdk.gradle'
 apply from: 'scripts/maven.gradle'
 
 apply from: 'scripts/advantagescope.gradle'
-apply from: 'scripts/choreo.gradle'
 apply from: 'scripts/elastic.gradle'
 
 // Tools must happen after maven
@@ -223,7 +222,6 @@ def generateFullResourcesTask = tasks.register('generateFullResources', project.
     jdkZipSetup(it)
 
     advantageScopeZipSetup(it)
-    choreoZipSetup(it)
     elasticZipSetup(it)
 
     if (OperatingSystem.current().isWindows()) {
@@ -330,7 +328,6 @@ def generateConfigFiles = tasks.register('generateCommonResources', Zip) {
     jdkConfigFileSetup(zip)
 
     advantageScopeConfigFileSetup(zip)
-    choreoConfigFileSetup(zip)
     elasticConfigFileSetup(zip)
 
     vscodeConfigZipSetup(zip)

gradleriobase/build.gradle

@@ -6,13 +6,6 @@ plugins {
     id "edu.wpi.first.GradleRIO"
 }
 
-repositories {
-    mavenCentral()
-    maven {
-        url = uri("https://SleipnirGroup.github.io/ChoreoLib/dep")
-    }
-}
-
 deploy {
     targets {
         roborio(getTargetTypeClass('RoboRIO')) {
@@ -41,8 +34,6 @@ def deployCppArtifact = deploy.targets.roborio.artifacts.frcCpp
 
 wpi.java.debugJni = false
 
-def choreoVersion = "$choreoGitTag".substring(1)
-
 dependencies {
     annotationProcessor wpi.java.deps.wpilibAnnotations()
     implementation wpi.java.deps.wpilib()
@@ -84,9 +75,6 @@ dependencies {
     if (project(":").ext.buildClassifier == 'Windows') {
         implementation "edu.wpi.first.msvc:runtime:${project(':gradleriobase').wpi.versions.wpilibVersion.get()}:x64@zip"
     }
-
-    // choreo
-    implementation "choreo:ChoreoLib-java:$choreoVersion"
 }
 
 test {
@@ -125,20 +113,6 @@ nativeUtils {
     }
 }
 
-nativeUtils {
-    nativeDependencyContainer {
-        choreo(getNativeDependencyTypeClass('WPISharedMavenDependency')) {
-            groupId = "choreo"
-            artifactId = "ChoreoLib-cpp"
-            headerClassifier = "headers"
-            sourceClassifier = "sources"
-            ext = "zip"
-            version = choreoVersion
-            targetPlatforms.addAll(nativeUtils.wpi.platforms.allPlatforms)
-        }
-    }
-}
-
 nativeUtils {
     nativeDependencyContainer {
         xrpvendordep(getNativeDependencyTypeClass('WPISharedMavenDependency')) {
@@ -181,7 +155,6 @@ model {
             wpi.cpp.deps.googleTest(it)
 
             wpi.cpp.deps.useLibrary(it, 'wpilibnewcommands')
-            wpi.cpp.deps.useLibrary(it, 'choreo')
             wpi.cpp.deps.useLibrary(it, 'xrpvendordep')
             wpi.cpp.deps.useLibrary(it, 'romivendordep')
         }

scripts/maven.gradle

@@ -205,13 +205,6 @@ def downloadNewCommands = tasks.register('downloadNewCommands', Download) {
   overwrite false
 }
 
-def downloadChoreo = tasks.register('downloadChoreo', Download) {
-  src 'https://SleipnirGroup.github.io/ChoreoLib/dep/ChoreoLib2025Beta.json'
-  def fileName = file(src.file).name
-  dest "$buildDir/downloads/$fileName"
-  overwrite false
-}
-
 def downloadRomiVendor = tasks.register('downloadRomiVendor', Download) {
   src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/romiVendordep/RomiVendordep.json'
   def fileName = file(src.file).name
@@ -234,18 +227,13 @@ ext.mavenZipSetup = { AbstractArchiveTask zip->
   }
 
   zip.dependsOn downloadNewCommands
-  zip.dependsOn downloadChoreo
   zip.dependsOn downloadReadTheDocs
   zip.dependsOn downloadPythonAPI
 
   zip.from(downloadNewCommands.get().outputFiles.first()) {
     into '/vendordeps'
   }
 
-  zip.from(downloadChoreo.get().outputFiles.first()) {
-    into '/vendordeps'
-  }
-
   zip.from(downloadRomiVendor.get().outputFiles.first()) {
     into '/vendordeps'
   }

scripts/tools.gradle

@@ -59,11 +59,6 @@ def toolsJsonTask = tasks.register('toolsJson', Task) {
     advantageScopeItem['version'] = advantagescopeGitTag
     config << advantageScopeItem
 
-    def choreoItem = [:]
-    choreoItem['name'] = "Choreo"
-    choreoItem['version'] = choreoGitTag
-    config << choreoItem
-
     def elasticItem = [:]
     elasticItem['name'] = "Elastic"
     elasticItem['version'] = elasticGitTag

scripts/versions.gradle

@@ -23,8 +23,6 @@ ext.jdkVersion = '17.0.12+7'
 
 ext.advantagescopeGitTag = 'v4.0.0-beta-3'
 
-ext.choreoGitTag = 'v2025.0.0-beta-6'
-
 ext.elasticGitTag = 'v2025.0.0-beta-4'
 
 ext.frcYear = '2025'