From e8c22814398157939e21f60fef78f89745c4d970 Mon Sep 17 00:00:00 2001 From: PranotiPD Date: Sat, 27 Jan 2024 17:04:13 +0530 Subject: [PATCH 1/2] Fixes #3240 : Renamed mockito bom artifact --- subprojects/bom/bom.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/bom/bom.gradle b/subprojects/bom/bom.gradle index 0060e4ee40..0f93c8903a 100644 --- a/subprojects/bom/bom.gradle +++ b/subprojects/bom/bom.gradle @@ -15,7 +15,7 @@ dependencies { api(project.rootProject) project.rootProject.subprojects.forEach { subproject -> if (!subproject.name.endsWith("Test") && - !subproject.name.endsWith("-test") && + !subproject.name.endsWith("java21-test") && subproject.name != "bom") { api(subproject) } From fa29211f868abe9b3e96940b451244e768439327 Mon Sep 17 00:00:00 2001 From: PranotiPD Date: Sun, 28 Jan 2024 13:35:34 +0530 Subject: [PATCH 2/2] Fixes #3240 : Renamed java21 to java21-test in settings.gradle and folder --- settings.gradle.kts | 2 +- subprojects/bom/bom.gradle | 2 +- .../{java21/java21.gradle => java21-test/java21-test.gradle} | 0 .../stubbing/answers/DeepStubReturnsEnumJava21Test.java | 0 .../src/test/java/org/mockito/java21/RecordTest.java | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename subprojects/{java21/java21.gradle => java21-test/java21-test.gradle} (100%) rename subprojects/{java21 => java21-test}/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava21Test.java (100%) rename subprojects/{java21 => java21-test}/src/test/java/org/mockito/java21/RecordTest.java (100%) diff --git a/settings.gradle.kts b/settings.gradle.kts index 330a91e381..0c953e08a5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,7 +23,7 @@ include( "bom", "errorprone", "programmatic-test", - "java21" + "java21-test" ) // https://developer.android.com/studio/command-line/variables#envar diff --git a/subprojects/bom/bom.gradle b/subprojects/bom/bom.gradle index 0f93c8903a..0060e4ee40 100644 --- a/subprojects/bom/bom.gradle +++ b/subprojects/bom/bom.gradle @@ -15,7 +15,7 @@ dependencies { api(project.rootProject) project.rootProject.subprojects.forEach { subproject -> if (!subproject.name.endsWith("Test") && - !subproject.name.endsWith("java21-test") && + !subproject.name.endsWith("-test") && subproject.name != "bom") { api(subproject) } diff --git a/subprojects/java21/java21.gradle b/subprojects/java21-test/java21-test.gradle similarity index 100% rename from subprojects/java21/java21.gradle rename to subprojects/java21-test/java21-test.gradle diff --git a/subprojects/java21/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava21Test.java b/subprojects/java21-test/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava21Test.java similarity index 100% rename from subprojects/java21/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava21Test.java rename to subprojects/java21-test/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava21Test.java diff --git a/subprojects/java21/src/test/java/org/mockito/java21/RecordTest.java b/subprojects/java21-test/src/test/java/org/mockito/java21/RecordTest.java similarity index 100% rename from subprojects/java21/src/test/java/org/mockito/java21/RecordTest.java rename to subprojects/java21-test/src/test/java/org/mockito/java21/RecordTest.java