From cc13d782a0d81c3013b67a0d57a1b754191740b4 Mon Sep 17 00:00:00 2001 From: doinkythederp Date: Wed, 15 Jan 2025 11:03:54 -0800 Subject: [PATCH 1/2] feat: update to maple-sim 0.3.1 This should fix the issue with the stacks not appearing in AdvantageScope --- vendordeps/maple-sim.json | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/vendordeps/maple-sim.json b/vendordeps/maple-sim.json index 57be408..be62dbd 100644 --- a/vendordeps/maple-sim.json +++ b/vendordeps/maple-sim.json @@ -1,7 +1,13 @@ { "fileName": "maple-sim.json", "name": "maplesim", - "version": "0.3.0", + "version": "0.3.1", + "frcYear": "2025", + "uuid": "c39481e8-4a63-4a4c-9df6-48d91e4da37b", + "mavenUrls": [{ + "fileName": "maple-sim.json", + "name": "maplesim", + "version": "0.3.2", "frcYear": "2025", "uuid": "c39481e8-4a63-4a4c-9df6-48d91e4da37b", "mavenUrls": [ @@ -13,7 +19,30 @@ { "groupId": "org.ironmaple", "artifactId": "maplesim-java", - "version": "0.3.0" + "version": "0.3.2" + }, + { + "groupId": "org.dyn4j", + "artifactId": "dyn4j", + "version": "5.0.2" + } + ], + "jniDependencies": [ + + ], + "cppDependencies": [ + + ] +} + "https://shenzhen-robotics-alliance.github.io/maple-sim/vendordep/repos/releases", + "https://repo1.maven.org/maven2" + ], + "jsonUrl": "https://shenzhen-robotics-alliance.github.io/maple-sim/vendordep/maple-sim.json", + "javaDependencies": [ + { + "groupId": "org.ironmaple", + "artifactId": "maplesim-java", + "version": "0.3.1" }, { "groupId": "org.dyn4j", From eb90a5893e55e679a11697a9c09db58eb51f12b4 Mon Sep 17 00:00:00 2001 From: doinkythederp Date: Wed, 15 Jan 2025 11:05:37 -0800 Subject: [PATCH 2/2] fix: correct JSON syntax issues --- vendordeps/maple-sim.json | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/vendordeps/maple-sim.json b/vendordeps/maple-sim.json index be62dbd..d431d61 100644 --- a/vendordeps/maple-sim.json +++ b/vendordeps/maple-sim.json @@ -1,10 +1,4 @@ { - "fileName": "maple-sim.json", - "name": "maplesim", - "version": "0.3.1", - "frcYear": "2025", - "uuid": "c39481e8-4a63-4a4c-9df6-48d91e4da37b", - "mavenUrls": [{ "fileName": "maple-sim.json", "name": "maplesim", "version": "0.3.2", @@ -34,26 +28,3 @@ ] } - "https://shenzhen-robotics-alliance.github.io/maple-sim/vendordep/repos/releases", - "https://repo1.maven.org/maven2" - ], - "jsonUrl": "https://shenzhen-robotics-alliance.github.io/maple-sim/vendordep/maple-sim.json", - "javaDependencies": [ - { - "groupId": "org.ironmaple", - "artifactId": "maplesim-java", - "version": "0.3.1" - }, - { - "groupId": "org.dyn4j", - "artifactId": "dyn4j", - "version": "5.0.2" - } - ], - "jniDependencies": [ - - ], - "cppDependencies": [ - - ] -}