diff --git a/.circleci/template.sh b/.circleci/template.sh index b3f86743..927020ff 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 6b2774fe..a2e18574 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,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() @@ -49,8 +50,6 @@ subprojects { apply plugin: 'java-library' apply plugin: 'org.inferred.processors' - sourceCompatibility = 11 - targetCompatibility = 11 tasks.withType(Checkstyle).configureEach { enabled = false @@ -99,3 +98,7 @@ idea.project.ipr.withXml { xml -> jdks { daemonTarget = 17 } + +javaVersions { + libraryTarget = 11 +}