Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to 2025 toolchains #230

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to 2025 toolchains #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import edu.wpi.first.toolchain.opensdk.OpenSdkToolchainExtension;

public abstract class Arm32ToolchainExtension extends OpenSdkToolchainExtension {
public static final String TOOLCHAIN_VERSION = "2024-10.2.0";
public static final String TOOLCHAIN_VERSION = "2025-12.2.0";
public static final String INSTALL_SUBDIR = "arm32";

@Inject
public Arm32ToolchainExtension() {
super();
getVersionLow().convention("10.2.0");
getVersionHigh().convention("10.2.0");
getVersionLow().convention("12.2.0");
getVersionHigh().convention("12.2.0");
getToolchainVersion().convention(TOOLCHAIN_VERSION);
}
}
4 changes: 2 additions & 2 deletions ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public class Arm32ToolchainPlugin implements Plugin<Project> {

public static final String toolchainName = "arm32";
public static final String baseToolchainName = "armhf-raspi-bullseye";
public static final String baseToolchainName = "armhf-raspi-bookworm";

private Arm32ToolchainExtension arm32Ext;
private OpenSdkToolchainBase opensdk;
Expand All @@ -35,7 +35,7 @@ public void apply(Project project) {
ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);

opensdk = new OpenSdkToolchainBase(baseToolchainName, arm32Ext, project, Arm32ToolchainExtension.INSTALL_SUBDIR,
"raspi-bullseye", project.provider(() -> "armv6-bullseye-linux-gnueabihf"),
"raspi-bookworm", project.provider(() -> "armv6-bookworm-linux-gnueabihf"),
toolchainExt.getToolchainGraphService(), operations);

CrossCompilerConfiguration configuration = project.getObjects().newInstance(CrossCompilerConfiguration.class,
Expand Down
6 changes: 3 additions & 3 deletions ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import edu.wpi.first.toolchain.opensdk.OpenSdkToolchainExtension;

public abstract class Arm64ToolchainExtension extends OpenSdkToolchainExtension {
public static final String TOOLCHAIN_VERSION = "2024-10.2.0";
public static final String TOOLCHAIN_VERSION = "2025-12.2.0";
public static final String INSTALL_SUBDIR = "arm64";

@Inject
public Arm64ToolchainExtension() {
super();
getVersionLow().convention("10.2.0");
getVersionHigh().convention("10.2.0");
getVersionLow().convention("12.2.0");
getVersionHigh().convention("12.2.0");
getToolchainVersion().convention(TOOLCHAIN_VERSION);
}
}
4 changes: 2 additions & 2 deletions ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public class Arm64ToolchainPlugin implements Plugin<Project> {

public static final String toolchainName = "arm64";
public static final String baseToolchainName = "arm64-bullseye";
public static final String baseToolchainName = "arm64-bookworm";

private Arm64ToolchainExtension arm64Ext;
private OpenSdkToolchainBase opensdk;
Expand All @@ -33,7 +33,7 @@ public void apply(Project project) {
ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);

opensdk = new OpenSdkToolchainBase(baseToolchainName, arm64Ext, project, Arm64ToolchainExtension.INSTALL_SUBDIR,
"bullseye", project.provider(() -> "aarch64-bullseye-linux-gnu"),
"bookworm", project.provider(() -> "aarch64-bookworm-linux-gnu"),
toolchainExt.getToolchainGraphService(), operations);

CrossCompilerConfiguration configuration = project.getObjects().newInstance(CrossCompilerConfiguration.class,
Expand Down
4 changes: 2 additions & 2 deletions ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/opensdk/OpenSdkToolchainBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ private String toolchainRemoteFile() {
} else {
String desktopPlatformArch = NativePlatforms.desktopPlatformArch(operations);
if (desktopPlatformArch.equals(NativePlatforms.arm64arch)) {
platformId = "aarch64-bullseye-linux-gnu";
platformId = "aarch64-bookworm-linux-gnu";
} else if (desktopPlatformArch.equals(NativePlatforms.arm32arch)) {
platformId = "armv6-bullseye-linux-gnueabihf";
platformId = "armv6-bookworm-linux-gnueabihf";
} else {
platformId = "x86_64-linux-gnu";
}
Expand Down
2 changes: 1 addition & 1 deletion ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/opensdk/OpenSdkToolchainExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public abstract class OpenSdkToolchainExtension {

@Inject
public OpenSdkToolchainExtension() {
getToolchainTag().convention("v2024-1");
getToolchainTag().convention("v2025-1");
}
}
2 changes: 1 addition & 1 deletion ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/roborio/RoboRioToolchainExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import edu.wpi.first.toolchain.opensdk.OpenSdkToolchainExtension;

public abstract class RoboRioToolchainExtension extends OpenSdkToolchainExtension {
public static final String TOOLCHAIN_VERSION = "2024-12.1.0";
public static final String TOOLCHAIN_VERSION = "2025-12.1.0";
public static final String INSTALL_SUBDIR = "roborio";

@Inject
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ java {

allprojects {
group = "edu.wpi.first"
version = "2025.6.0"
version = "2025.7.0"

if (project.hasProperty('publishVersion')) {
version = project.publishVersion
Expand Down
2 changes: 1 addition & 1 deletion testing/cpp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import edu.wpi.first.nativeutils.vendordeps.WPIVendorDepsPlugin

plugins {
id "cpp"
id "edu.wpi.first.NativeUtils" version "2025.6.0"
id "edu.wpi.first.NativeUtils" version "2025.7.0"
}

nativeUtils.addWpiNativeUtils()
Expand Down