Skip to content

Commit b51f2e8

Browse files
tbowers7tbowers7
committed
Revert Phoenix libraries to non-replay versions
YAGSL no longer depends on the replay versions of the Phoenix 5/6 libraries.
1 parent e28a89c commit b51f2e8

2 files changed

Lines changed: 33 additions & 131 deletions

File tree

vendordeps/Phoenix5-replay-5.36.0.json renamed to vendordeps/Phoenix5-5.36.0.json

Lines changed: 19 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
"fileName": "Phoenix5-replay-5.36.0.json",
2+
"fileName": "Phoenix5-5.36.0.json",
33
"name": "CTRE-Phoenix (v5)",
44
"version": "5.36.0",
55
"frcYear": "2026",
6-
"uuid": "fbc886a4-2cec-40c0-9835-71086a8cc3df",
6+
"uuid": "ab676553-b602-441f-a38d-f1296eff6537",
77
"mavenUrls": [
88
"https://maven.ctr-electronics.com/release/"
99
],
10-
"jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix/Phoenix5-replay-frc2026-latest.json",
10+
"jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix/Phoenix5-frc2026-latest.json",
1111
"requires": [
1212
{
13-
"uuid": "e7900d8d-826f-4dca-a1ff-182f658e98af",
13+
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
1414
"errorMessage": "Phoenix 5 requires low-level libraries from Phoenix 6. Please add the Phoenix 6 vendordep before adding Phoenix 5.",
15-
"offlineFileName": "Phoenix6-replay-frc2026-latest.json",
16-
"onlineUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-replay-frc2026-latest.json"
15+
"offlineFileName": "Phoenix6-frc2026-latest.json",
16+
"onlineUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2026-latest.json"
1717
}
1818
],
1919
"conflictsWith": [
2020
{
21-
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
22-
"errorMessage": "Users must use the regular Phoenix 5 vendordep when using the regular Phoenix 6 vendordep.",
23-
"offlineFileName": "Phoenix6-frc2026-latest.json"
21+
"uuid": "e7900d8d-826f-4dca-a1ff-182f658e98af",
22+
"errorMessage": "Users must use the Phoenix 5 replay vendordep when using the Phoenix 6 replay vendordep.",
23+
"offlineFileName": "Phoenix6-replay-frc2026-latest.json"
2424
},
2525
{
26-
"uuid": "ab676553-b602-441f-a38d-f1296eff6537",
26+
"uuid": "fbc886a4-2cec-40c0-9835-71086a8cc3df",
2727
"errorMessage": "Users cannot have both the replay and regular Phoenix 5 vendordeps in their robot program.",
28-
"offlineFileName": "Phoenix5-frc2026-latest.json"
28+
"offlineFileName": "Phoenix5-replay-frc2026-latest.json"
2929
}
3030
],
3131
"javaDependencies": [
@@ -47,22 +47,11 @@
4747
"version": "5.36.0",
4848
"isJar": false,
4949
"skipInvalidPlatforms": true,
50-
"validPlatforms": [
51-
"linuxathena"
52-
],
53-
"simMode": "hwsim"
54-
},
55-
{
56-
"groupId": "com.ctre.phoenix.replay",
57-
"artifactId": "cci-replay",
58-
"version": "5.36.0",
59-
"isJar": false,
60-
"skipInvalidPlatforms": true,
6150
"validPlatforms": [
6251
"windowsx86-64",
6352
"linuxx86-64",
6453
"linuxarm64",
65-
"osxuniversal"
54+
"linuxathena"
6655
],
6756
"simMode": "hwsim"
6857
},
@@ -91,6 +80,9 @@
9180
"sharedLibrary": true,
9281
"skipInvalidPlatforms": true,
9382
"binaryPlatforms": [
83+
"windowsx86-64",
84+
"linuxx86-64",
85+
"linuxarm64",
9486
"linuxathena"
9587
],
9688
"simMode": "hwsim"
@@ -104,6 +96,9 @@
10496
"sharedLibrary": true,
10597
"skipInvalidPlatforms": true,
10698
"binaryPlatforms": [
99+
"windowsx86-64",
100+
"linuxx86-64",
101+
"linuxarm64",
107102
"linuxathena"
108103
],
109104
"simMode": "hwsim"
@@ -116,56 +111,11 @@
116111
"headerClassifier": "headers",
117112
"sharedLibrary": true,
118113
"skipInvalidPlatforms": true,
119-
"binaryPlatforms": [
120-
"linuxathena"
121-
],
122-
"simMode": "hwsim"
123-
},
124-
{
125-
"groupId": "com.ctre.phoenix.replay",
126-
"artifactId": "wpiapi-cpp-replay",
127-
"version": "5.36.0",
128-
"libName": "CTRE_Phoenix_WPIReplay",
129-
"headerClassifier": "headers",
130-
"sharedLibrary": true,
131-
"skipInvalidPlatforms": true,
132114
"binaryPlatforms": [
133115
"windowsx86-64",
134116
"linuxx86-64",
135117
"linuxarm64",
136-
"osxuniversal"
137-
],
138-
"simMode": "hwsim"
139-
},
140-
{
141-
"groupId": "com.ctre.phoenix.replay",
142-
"artifactId": "api-cpp-replay",
143-
"version": "5.36.0",
144-
"libName": "CTRE_PhoenixReplay",
145-
"headerClassifier": "headers",
146-
"sharedLibrary": true,
147-
"skipInvalidPlatforms": true,
148-
"binaryPlatforms": [
149-
"windowsx86-64",
150-
"linuxx86-64",
151-
"linuxarm64",
152-
"osxuniversal"
153-
],
154-
"simMode": "hwsim"
155-
},
156-
{
157-
"groupId": "com.ctre.phoenix.replay",
158-
"artifactId": "cci-replay",
159-
"version": "5.36.0",
160-
"libName": "CTRE_PhoenixCCIReplay",
161-
"headerClassifier": "headers",
162-
"sharedLibrary": true,
163-
"skipInvalidPlatforms": true,
164-
"binaryPlatforms": [
165-
"windowsx86-64",
166-
"linuxx86-64",
167-
"linuxarm64",
168-
"osxuniversal"
118+
"linuxathena"
169119
],
170120
"simMode": "hwsim"
171121
},

vendordeps/Phoenix6-replay-frc2026-latest.json renamed to vendordeps/Phoenix6-26.1.1.json

Lines changed: 14 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"fileName": "Phoenix6-replay-frc2026-latest.json",
3-
"name": "CTRE-Phoenix (v6) Replay",
2+
"fileName": "Phoenix6-26.1.1.json",
3+
"name": "CTRE-Phoenix (v6)",
44
"version": "26.1.1",
55
"frcYear": "2026",
6-
"uuid": "e7900d8d-826f-4dca-a1ff-182f658e98af",
6+
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
77
"mavenUrls": [
88
"https://maven.ctr-electronics.com/release/"
99
],
10-
"jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-replay-frc2026-latest.json",
10+
"jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2026-latest.json",
1111
"conflictsWith": [
1212
{
13-
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
13+
"uuid": "e7900d8d-826f-4dca-a1ff-182f658e98af",
1414
"errorMessage": "Users can not have both the replay and regular Phoenix 6 vendordeps in their robot program.",
15-
"offlineFileName": "Phoenix6-frc2026-latest.json"
15+
"offlineFileName": "Phoenix6-replay-frc2026-latest.json"
1616
}
1717
],
1818
"javaDependencies": [
@@ -29,47 +29,25 @@
2929
"version": "26.1.1",
3030
"isJar": false,
3131
"skipInvalidPlatforms": true,
32-
"validPlatforms": [
33-
"linuxathena"
34-
],
35-
"simMode": "hwsim"
36-
},
37-
{
38-
"groupId": "com.ctre.phoenix6",
39-
"artifactId": "tools",
40-
"version": "26.1.1",
41-
"isJar": false,
42-
"skipInvalidPlatforms": true,
43-
"validPlatforms": [
44-
"linuxathena"
45-
],
46-
"simMode": "hwsim"
47-
},
48-
{
49-
"groupId": "com.ctre.phoenix6.replay",
50-
"artifactId": "api-cpp-replay",
51-
"version": "26.1.1",
52-
"isJar": false,
53-
"skipInvalidPlatforms": true,
5432
"validPlatforms": [
5533
"windowsx86-64",
5634
"linuxx86-64",
5735
"linuxarm64",
58-
"osxuniversal"
36+
"linuxathena"
5937
],
6038
"simMode": "hwsim"
6139
},
6240
{
63-
"groupId": "com.ctre.phoenix6.replay",
64-
"artifactId": "tools-replay",
41+
"groupId": "com.ctre.phoenix6",
42+
"artifactId": "tools",
6543
"version": "26.1.1",
6644
"isJar": false,
6745
"skipInvalidPlatforms": true,
6846
"validPlatforms": [
6947
"windowsx86-64",
7048
"linuxx86-64",
7149
"linuxarm64",
72-
"osxuniversal"
50+
"linuxathena"
7351
],
7452
"simMode": "hwsim"
7553
},
@@ -252,6 +230,9 @@
252230
"sharedLibrary": true,
253231
"skipInvalidPlatforms": true,
254232
"binaryPlatforms": [
233+
"windowsx86-64",
234+
"linuxx86-64",
235+
"linuxarm64",
255236
"linuxathena"
256237
],
257238
"simMode": "hwsim"
@@ -264,40 +245,11 @@
264245
"headerClassifier": "headers",
265246
"sharedLibrary": true,
266247
"skipInvalidPlatforms": true,
267-
"binaryPlatforms": [
268-
"linuxathena"
269-
],
270-
"simMode": "hwsim"
271-
},
272-
{
273-
"groupId": "com.ctre.phoenix6.replay",
274-
"artifactId": "wpiapi-cpp-replay",
275-
"version": "26.1.1",
276-
"libName": "CTRE_Phoenix6_WPIReplay",
277-
"headerClassifier": "headers",
278-
"sharedLibrary": true,
279-
"skipInvalidPlatforms": true,
280248
"binaryPlatforms": [
281249
"windowsx86-64",
282250
"linuxx86-64",
283251
"linuxarm64",
284-
"osxuniversal"
285-
],
286-
"simMode": "hwsim"
287-
},
288-
{
289-
"groupId": "com.ctre.phoenix6.replay",
290-
"artifactId": "tools-replay",
291-
"version": "26.1.1",
292-
"libName": "CTRE_PhoenixTools_Replay",
293-
"headerClassifier": "headers",
294-
"sharedLibrary": true,
295-
"skipInvalidPlatforms": true,
296-
"binaryPlatforms": [
297-
"windowsx86-64",
298-
"linuxx86-64",
299-
"linuxarm64",
300-
"osxuniversal"
252+
"linuxathena"
301253
],
302254
"simMode": "hwsim"
303255
},

0 commit comments

Comments
 (0)