Fixes mockito#3240 : Renamed java21 to java21-test in settings.gradle…

… and folder
PranotiPD · Jan 28, 2024 · fa29211 · fa29211
1 parent 71b2628
commit fa29211
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 → subprojects/java21-test/java21-test.gradle b/subprojects/java21/java21.gradle → subprojects/java21-test/java21-test.gradle
diff --git a/...nswers/DeepStubReturnsEnumJava21Test.java → ...nswers/DeepStubReturnsEnumJava21Test.java b/...nswers/DeepStubReturnsEnumJava21Test.java → ...nswers/DeepStubReturnsEnumJava21Test.java
diff --git a/...t/java/org/mockito/java21/RecordTest.java → ...t/java/org/mockito/java21/RecordTest.java b/...t/java/org/mockito/java21/RecordTest.java → ...t/java/org/mockito/java21/RecordTest.java