Try to add AdvantageKit, now none of my imports work instead of only …

…some of them
team401 · Oct 9, 2024 · 8bf802f · 8bf802f
1 parent c65c310
commit 8bf802f
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 36 deletions.
diff --git a/wpi_interface/build.gradle b/wpi_interface/build.gradle
@@ -18,6 +18,9 @@ def includeDesktopSupport = true
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
 // Also defines JUnit 5.
 dependencies {
+	def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text)
+	annotationProcessor "org.littletonrobotics.akit.junction:junction-autolog:$akitJson.version"
+
 	implementation project(":monitors")
 	implementation 'edu.wpi.first.wpilibj:wpilibj-java:2024.3.2'
 	implementation 'edu.wpi.first.wpilibNewCommands:wpilibNewCommands-java:2024.3.2'
@@ -53,10 +56,27 @@ repositories {
 	mavenLocal()
 	maven {
 		url 'https://frcmaven.wpi.edu/artifactory/release/'
+	}
+		maven {
+		url = uri("https://maven.pkg.github.com/Mechanical-Advantage/AdvantageKit")
+		credentials {
+			username = "Mechanical-Advantage-Bot"
+			password = "\u0067\u0068\u0070\u005f\u006e\u0056\u0051\u006a\u0055\u004f\u004c\u0061\u0079\u0066\u006e\u0078\u006e\u0037\u0051\u0049\u0054\u0042\u0032\u004c\u004a\u006d\u0055\u0070\u0073\u0031\u006d\u0037\u004c\u005a\u0030\u0076\u0062\u0070\u0063\u0051"
+		}
 	}
 	gradlePluginPortal()
 }
 
+configurations.all {
+	exclude group: "edu.wpi.first.wpilibj"
+}
+
+task(checkAkitInstall, dependsOn: "classes", type: JavaExec) {
+	mainClass = "org.littletonrobotics.junction.CheckInstall"
+	classpath = sourceSets.main.runtimeClasspath
+}
+compileJava.finalizedBy checkAkitInstall
+
 spotless {
 // optional: limit format enforcement to just the files changed by this feature branch
 ratchetFrom 'origin/main'

diff --git a/wpi_interface/vendordeps/AdvantageKit.json b/wpi_interface/vendordeps/AdvantageKit.json
@@ -0,0 +1,42 @@
+{
+    "fileName": "AdvantageKit.json",
+    "name": "AdvantageKit",
+    "version": "3.2.1",
+    "uuid": "d820cc26-74e3-11ec-90d6-0242ac120003",
+    "frcYear": "2024",
+    "mavenUrls": [],
+    "jsonUrl": "https://github.com/Mechanical-Advantage/AdvantageKit/releases/latest/download/AdvantageKit.json",
+    "javaDependencies": [        
+        {
+            "groupId": "org.littletonrobotics.akit.junction",
+            "artifactId": "wpilib-shim",
+            "version": "3.2.1"
+        },        
+        {
+            "groupId": "org.littletonrobotics.akit.junction",
+            "artifactId": "junction-core",
+            "version": "3.2.1"
+        },        
+        {
+            "groupId": "org.littletonrobotics.akit.conduit",
+            "artifactId": "conduit-api",
+            "version": "3.2.1"
+        }
+    ],
+    "jniDependencies": [        
+        {
+            "groupId": "org.littletonrobotics.akit.conduit",
+            "artifactId": "conduit-wpilibio",
+            "version": "3.2.1",
+            "skipInvalidPlatforms": false,
+            "isJar": false,
+            "validPlatforms": [
+                "linuxathena",
+                "windowsx86-64",
+                "linuxx86-64",
+                "osxuniversal"
+            ]
+        }
+    ],
+    "cppDependencies": []
+}
diff --git a/wpi_interface/vendordeps/WPILibNewCommands.json b/wpi_interface/vendordeps/WPILibNewCommands.json
@@ -1,38 +1,38 @@
 {
-    "fileName": "WPILibNewCommands.json",
-    "name": "WPILib-New-Commands",
-    "version": "1.0.0",
-    "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266",
-    "frcYear": "2024",
-    "mavenUrls": [],
-    "jsonUrl": "",
-    "javaDependencies": [
-        {
-            "groupId": "edu.wpi.first.wpilibNewCommands",
-            "artifactId": "wpilibNewCommands-java",
-            "version": "wpilib"
-        }
-    ],
-    "jniDependencies": [],
-    "cppDependencies": [
-        {
-            "groupId": "edu.wpi.first.wpilibNewCommands",
-            "artifactId": "wpilibNewCommands-cpp",
-            "version": "wpilib",
-            "libName": "wpilibNewCommands",
-            "headerClassifier": "headers",
-            "sourcesClassifier": "sources",
-            "sharedLibrary": true,
-            "skipInvalidPlatforms": true,
-            "binaryPlatforms": [
-                "linuxathena",
-                "linuxarm32",
-                "linuxarm64",
-                "windowsx86-64",
-                "windowsx86",
-                "linuxx86-64",
-                "osxuniversal"
-            ]
-        }
-    ]
+  "fileName": "WPILibNewCommands.json",
+  "name": "WPILib-New-Commands",
+  "version": "1.0.0",
+  "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266",
+  "frcYear": "2024",
+  "mavenUrls": [],
+  "jsonUrl": "",
+  "javaDependencies": [
+    {
+      "groupId": "edu.wpi.first.wpilibNewCommands",
+      "artifactId": "wpilibNewCommands-java",
+      "version": "wpilib"
+    }
+  ],
+  "jniDependencies": [],
+  "cppDependencies": [
+    {
+      "groupId": "edu.wpi.first.wpilibNewCommands",
+      "artifactId": "wpilibNewCommands-cpp",
+      "version": "wpilib",
+      "libName": "wpilibNewCommands",
+      "headerClassifier": "headers",
+      "sourcesClassifier": "sources",
+      "sharedLibrary": true,
+      "skipInvalidPlatforms": true,
+      "binaryPlatforms": [
+        "linuxathena",
+        "linuxarm32",
+        "linuxarm64",
+        "windowsx86-64",
+        "windowsx86",
+        "linuxx86-64",
+        "osxuniversal"
+      ]
+    }
+  ]
 }