Update vendor template for 2025 (#39)
Use Gradle 8.10.2 Use 2025 artifacts Remove Googletest, since managed automatically by native-utils
This commit is contained in:
sciencewhiz
GitHub
parent
287b9d939e
commit
2075a27ba3
@ -2,7 +2,7 @@
|
||||
"fileName": "ExampleVendorJson.json",
|
||||
"name": "ExampleVendorDep",
|
||||
"version": "0.0.1",
|
||||
"frcYear": "2024",
|
||||
"frcYear": "2025",
|
||||
"uuid": "Generate A Unique GUID https://guidgenerator.com/online-guid-generator.aspx and insert it here", This line is to purposely make this fail to parse
|
||||
"mavenUrls": [
|
||||
"ThisNeedsToBeTheRootMavenUrl"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# WPILib Vendor Template
|
||||
|
||||
This is the base WPILib vendor template for 2023.
|
||||
This is the base WPILib vendor template for 2025.
|
||||
|
||||
## Layout
|
||||
|
||||
|
||||
22
build.gradle
22
build.gradle
@ -3,7 +3,7 @@ plugins {
|
||||
id 'java'
|
||||
id 'google-test'
|
||||
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
|
||||
id 'edu.wpi.first.NativeUtils' version '2024.7.2'
|
||||
id 'edu.wpi.first.NativeUtils' version '2025.3.0'
|
||||
id 'edu.wpi.first.GradleJni' version '1.1.0'
|
||||
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
|
||||
}
|
||||
@ -22,19 +22,19 @@ apply from: 'config.gradle'
|
||||
|
||||
// Apply Java configuration
|
||||
dependencies {
|
||||
implementation 'edu.wpi.first.cscore:cscore-java:2024.+'
|
||||
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2024.+'
|
||||
implementation 'edu.wpi.first.ntcore:ntcore-java:2024.+'
|
||||
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2024.+'
|
||||
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2024.+'
|
||||
implementation 'edu.wpi.first.wpimath:wpimath-java:2024.+'
|
||||
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2024.+'
|
||||
implementation 'edu.wpi.first.hal:hal-java:2024.+'
|
||||
implementation 'edu.wpi.first.cscore:cscore-java:2025.+'
|
||||
implementation 'edu.wpi.first.cameraserver:cameraserver-java:2025.+'
|
||||
implementation 'edu.wpi.first.ntcore:ntcore-java:2025.+'
|
||||
implementation 'edu.wpi.first.wpilibj:wpilibj-java:2025.+'
|
||||
implementation 'edu.wpi.first.wpiutil:wpiutil-java:2025.+'
|
||||
implementation 'edu.wpi.first.wpimath:wpimath-java:2025.+'
|
||||
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2025.+'
|
||||
implementation 'edu.wpi.first.hal:hal-java:2025.+'
|
||||
implementation "org.ejml:ejml-simple:0.43.1"
|
||||
implementation "com.fasterxml.jackson.core:jackson-annotations:2.15.2"
|
||||
implementation "com.fasterxml.jackson.core:jackson-core:2.15.2"
|
||||
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
|
||||
implementation 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:4.8.0-2'
|
||||
implementation 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:4.8.0-4'
|
||||
}
|
||||
|
||||
// Set up exports properly
|
||||
@ -126,5 +126,5 @@ model {
|
||||
apply from: 'publish.gradle'
|
||||
|
||||
wrapper {
|
||||
gradleVersion '8.5'
|
||||
gradleVersion '8.10.2'
|
||||
}
|
||||
|
||||
@ -8,12 +8,10 @@ nativeUtils.withCrossLinuxArm64()
|
||||
nativeUtils {
|
||||
wpi {
|
||||
configureDependencies {
|
||||
wpiVersion = "2024.+"
|
||||
wpiVersion = "2025.+"
|
||||
opencvYear = "frc2024"
|
||||
googleTestYear = "frc2024"
|
||||
niLibVersion = "2024.2.1"
|
||||
opencvVersion = "4.8.0-2"
|
||||
googleTestVersion = "1.14.0-1"
|
||||
niLibVersion = "2025.0.0"
|
||||
opencvVersion = "4.8.0-4"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
7
gradlew
vendored
7
gradlew
vendored
@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -84,7 +86,8 @@ done
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
22
gradlew.bat
vendored
22
gradlew.bat
vendored
@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user