From a0cc22d73c184d0367f38c4d4d34de71c030c9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Francoeur?= Date: Mon, 27 Nov 2023 03:27:37 -0500 Subject: [PATCH] Add module for Java 21 tests (#3180) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #3179 Co-authored-by: Mikaël Francoeur the --- settings.gradle.kts | 3 ++- subprojects/java21/java21.gradle | 24 +++++++++++++++++++ .../src/test/java/org/mockito/java21/.gitkeep | 0 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 subprojects/java21/java21.gradle create mode 100644 subprojects/java21/src/test/java/org/mockito/java21/.gitkeep diff --git a/settings.gradle.kts b/settings.gradle.kts index ecc1e15460..b90dea2ee6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,7 +22,8 @@ include( "osgi-test", "bom", "errorprone", - "programmatic-test" + "programmatic-test", + "java21" ) // https://developer.android.com/studio/command-line/variables#envar diff --git a/subprojects/java21/java21.gradle b/subprojects/java21/java21.gradle new file mode 100644 index 0000000000..9a2415d516 --- /dev/null +++ b/subprojects/java21/java21.gradle @@ -0,0 +1,24 @@ +apply from: "$rootDir/gradle/dependencies.gradle" +apply from: "$rootDir/gradle/java-test.gradle" + +description = "Test suite for Java 21 Mockito" + +dependencies { + implementation project.rootProject + testImplementation libraries.junit4 + testImplementation libraries.assertj +} + +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +tasks.named('test') { + if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) { + enabled = false + } +} diff --git a/subprojects/java21/src/test/java/org/mockito/java21/.gitkeep b/subprojects/java21/src/test/java/org/mockito/java21/.gitkeep new file mode 100644 index 0000000000..e69de29bb2