diff --git a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/WPILibHome.java b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/WPILibHome.java index 8a9bbb3..01a9c27 100644 --- a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/WPILibHome.java +++ b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/WPILibHome.java @@ -32,7 +32,7 @@ static File computeHomeRoot(boolean isWindows, boolean isMacOsX, boolean isLinux } if (isMacOsX) { - return new File(userFolder, ".wpilib"); + return new File(userFolder, "wpilib"); } if (isLinux && xdgDataHome != null && !xdgDataHome.isBlank() diff --git a/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/WPILibHomeTest.groovy b/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/WPILibHomeTest.groovy index 8cf2e6f..794ca83 100644 --- a/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/WPILibHomeTest.groovy +++ b/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/WPILibHomeTest.groovy @@ -11,7 +11,7 @@ class WPILibHomeTest extends Specification { isWindows | isMacOsX | isLinux | userHome | publicFolder | xdgDataHome || expected true | false | false | "/home/user" | "C:\\Users\\Team" | null || new File("C:\\Users\\Team", "wpilib") true | false | false | "/home/user" | null | null || new File("C:\\Users\\Public", "wpilib") - false | true | false | "/Users/team" | null | null || new File("/Users/team", ".wpilib") + false | true | false | "/Users/team" | null | null || new File("/Users/team", "wpilib") false | false | true | "/home/team" | null | "/data/team/share" || new File("/data/team/share", "wpilib") false | false | true | "/home/team" | null | null || new File("/home/team/.local/share", "wpilib") false | false | true | "/home/team" | null | "" || new File("/home/team/.local/share", "wpilib") diff --git a/build.gradle b/build.gradle index 8c5f96c..9584eb8 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ java { allprojects { group = "org.wpilib" - version = "2027.14.3" + version = "2027.15.0" if (project.hasProperty('publishVersion')) { version = project.publishVersion diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle index fd1ef47..0e7c3a6 100644 --- a/testing/cpp/build.gradle +++ b/testing/cpp/build.gradle @@ -3,7 +3,7 @@ import org.wpilib.nativeutils.vendordeps.WPIVendorDepsPlugin plugins { id "cpp" - id "org.wpilib.NativeUtils" version "2027.14.3" + id "org.wpilib.NativeUtils" version "2027.15.0" } nativeUtils.addWpiNativeUtils()