diff --git a/build.gradle b/build.gradle index 801d348a..72b009d0 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ targetCompatibility = 11 allprojects { group = "edu.wpi.first" - version = "2024.2.0" + version = "2024.3.0" if (project.hasProperty('publishVersion')) { version = project.publishVersion diff --git a/src/main/java/edu/wpi/first/nativeutils/vendordeps/WPIVendorDepsExtension.java b/src/main/java/edu/wpi/first/nativeutils/vendordeps/WPIVendorDepsExtension.java index 2164fe07..cb655361 100644 --- a/src/main/java/edu/wpi/first/nativeutils/vendordeps/WPIVendorDepsExtension.java +++ b/src/main/java/edu/wpi/first/nativeutils/vendordeps/WPIVendorDepsExtension.java @@ -15,8 +15,6 @@ import org.gradle.api.NamedDomainObjectSet; import org.gradle.api.Project; import org.gradle.api.file.DirectoryProperty; -import org.gradle.api.logging.Logger; -import org.gradle.api.logging.Logging; import org.gradle.api.model.ObjectFactory; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.provider.Property; @@ -134,14 +132,10 @@ public void loadAll() { } public void validateDependencies() { - Logger logger = Logging.getLogger(WPIVendorDepsExtension.class); String requiredFrcYear = frcYear.getOrNull(); for (NamedJsonDependency jsonDep : dependencySet) { if (requiredFrcYear != null) { - if (jsonDep.dependency.frcYear == null || jsonDep.dependency.frcYear.isBlank()) { - logger.warn("Vendor Dependency %s is missing frcYear. In future years this will be an error", - jsonDep.dependency.name); - } else if (!requiredFrcYear.equals(jsonDep.dependency.frcYear)) { + if (!requiredFrcYear.equals(jsonDep.dependency.frcYear)) { throw new InvalidVendorDepYearException(jsonDep.dependency, requiredFrcYear); } } diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle index a479e829..e2cc478e 100644 --- a/testing/cpp/build.gradle +++ b/testing/cpp/build.gradle @@ -2,7 +2,7 @@ import edu.wpi.first.toolchain.NativePlatforms plugins { id "cpp" - id "edu.wpi.first.NativeUtils" version "2024.2.0" + id "edu.wpi.first.NativeUtils" version "2024.3.0" } nativeUtils.addWpiNativeUtils()