From 08a57a4af999e172ff3cb427d241f48f814feeb5 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Mon, 30 Sep 2024 23:04:07 +0000 Subject: [PATCH] Excavator: Use baseline-java-versions to manage Java versions --- .circleci/template.sh | 2 -- build.gradle | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/template.sh b/.circleci/template.sh index b3f867435..927020ff1 100644 --- a/.circleci/template.sh +++ b/.circleci/template.sh @@ -1,5 +1,3 @@ #!/usr/bin/env bash export CIRCLECI_TEMPLATE=java-library-oss export JDK=17 -export UNIT_TEST_11=true -export UNIT_TEST_15=true diff --git a/build.gradle b/build.gradle index d3e36c89e..ff649735f 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ apply plugin: 'com.palantir.jdks' apply plugin: 'com.palantir.jdks.latest' apply plugin: 'com.palantir.baseline' apply plugin: 'com.palantir.consistent-versions' +apply plugin: 'com.palantir.baseline-java-versions' version System.env.CIRCLE_TAG ?: gitVersion() @@ -47,8 +48,6 @@ subprojects { apply plugin: 'java-library' apply plugin: 'org.inferred.processors' - sourceCompatibility = 11 - targetCompatibility = 11 tasks.withType(Checkstyle).configureEach { enabled = false @@ -97,3 +96,7 @@ idea.project.ipr.withXml { xml -> jdks { daemonTarget = 17 } + +javaVersions { + libraryTarget = 11 +}