Fixes mockito#2877: removed mockito-inline as subproject and actual s…

…ubproject
krzyk · Mar 18, 2023 · c2e7800 · c2e7800
1 parent b6861e3
commit c2e7800
Show file tree

Hide file tree

Showing 28 changed files with 14 additions and 11 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 include("subclass",
-    "inline",
+    "inlineTest",
     "proxy",
     "extTest",
     "groovyTest",

diff --git a/subprojects/androidTest/androidTest.gradle b/subprojects/androidTest/androidTest.gradle
@@ -38,7 +38,7 @@ apply from: "$rootDir/gradle/dependencies.gradle"
 dependencies {
     implementation libraries.kotlin.stdlib
 
-    testImplementation project(":inline")
+    testImplementation project(":")
     testImplementation libraries.junit4
     testImplementation libraries.junitJupiterApi
     testImplementation libraries.junitJupiterEngine

diff --git a/subprojects/groovyInlineTest/groovyInlineTest.gradle b/subprojects/groovyInlineTest/groovyInlineTest.gradle
@@ -5,7 +5,7 @@ description = "Integration test for using mockito-inline with Groovy."
 apply from: "$rootDir/gradle/dependencies.gradle"
 
 dependencies {
-    testImplementation project(":inline")
+    testImplementation project(":")
     testImplementation libraries.groovy
     testImplementation libraries.junit4
 }
diff --git a/subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor b/subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor
diff --git a/subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker b/subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/subprojects/inline/inline.gradle → subprojects/inlineTest/inlineTest.gradle b/subprojects/inline/inline.gradle → subprojects/inlineTest/inlineTest.gradle
@@ -1,19 +1,24 @@
+plugins {
+    id 'java'
+}
+
 description = "Mockito preconfigured inline mock maker (intermediate and to be superseeded by automatic usage in a future version)"
 
-apply from: "$rootDir/gradle/java-library.gradle"
+apply from: "$rootDir/gradle/dependencies.gradle"
+
+sourceCompatibility = 11
+targetCompatibility = 11
 
 dependencies {
-    api project.rootProject
+    implementation project.rootProject
     testImplementation libraries.junit4
     testImplementation libraries.assertj
 }
 
 tasks.javadoc.enabled = false
 
-//required by the "StressTest.java" and "OneLinerStubStressTest.java"
-test.maxHeapSize = "256m"
-retryTest.maxHeapSize = "256m"
-
 test {
     jvmArgs '--illegal-access=deny'
+    //required by the "StressTest.java" and "OneLinerStubStressTest.java"
+    maxHeapSize '256m'
 }
diff --git a/...ckitoinline/ConstructionMockRuleTest.java → ...ckitoinline/ConstructionMockRuleTest.java b/...ckitoinline/ConstructionMockRuleTest.java → ...ckitoinline/ConstructionMockRuleTest.java
diff --git a/...g/mockitoinline/ConstructionMockTest.java → ...g/mockitoinline/ConstructionMockTest.java b/...g/mockitoinline/ConstructionMockTest.java → ...g/mockitoinline/ConstructionMockTest.java
diff --git a/...va/org/mockitoinline/EnumMockingTest.java → ...va/org/mockitoinline/EnumMockingTest.java b/...va/org/mockitoinline/EnumMockingTest.java → ...va/org/mockitoinline/EnumMockingTest.java
diff --git a/.../mockitoinline/FinalClassMockingTest.java → .../mockitoinline/FinalClassMockingTest.java b/.../mockitoinline/FinalClassMockingTest.java → .../mockitoinline/FinalClassMockingTest.java
diff --git a/...nline/HierarchyPreInitializationTest.java → ...nline/HierarchyPreInitializationTest.java b/...nline/HierarchyPreInitializationTest.java → ...nline/HierarchyPreInitializationTest.java
diff --git a/...ockitoinline/InOrderVerificationTest.java → ...ockitoinline/InOrderVerificationTest.java b/...ockitoinline/InOrderVerificationTest.java → ...ockitoinline/InOrderVerificationTest.java
diff --git a/...org/mockitoinline/InitializationTest.java → ...org/mockitoinline/InitializationTest.java b/...org/mockitoinline/InitializationTest.java → ...org/mockitoinline/InitializationTest.java
diff --git a/...mockitoinline/OneLinerStubStressTest.java → ...mockitoinline/OneLinerStubStressTest.java b/...mockitoinline/OneLinerStubStressTest.java → ...mockitoinline/OneLinerStubStressTest.java
diff --git a/...st/java/org/mockitoinline/PluginTest.java → ...st/java/org/mockitoinline/PluginTest.java b/...st/java/org/mockitoinline/PluginTest.java → ...st/java/org/mockitoinline/PluginTest.java
diff --git a/...java/org/mockitoinline/RecursionTest.java → ...java/org/mockitoinline/RecursionTest.java b/...java/org/mockitoinline/RecursionTest.java → ...java/org/mockitoinline/RecursionTest.java
diff --git a/...mockitoinline/SpyWithConstructorTest.java → ...mockitoinline/SpyWithConstructorTest.java b/...mockitoinline/SpyWithConstructorTest.java → ...mockitoinline/SpyWithConstructorTest.java
diff --git a/...org/mockitoinline/StaticMockRuleTest.java → ...org/mockitoinline/StaticMockRuleTest.java b/...org/mockitoinline/StaticMockRuleTest.java → ...org/mockitoinline/StaticMockRuleTest.java
diff --git a/...ava/org/mockitoinline/StaticMockTest.java → ...ava/org/mockitoinline/StaticMockTest.java b/...ava/org/mockitoinline/StaticMockTest.java → ...ava/org/mockitoinline/StaticMockTest.java
diff --git a/...ava/org/mockitoinline/StaticRuleTest.java → ...ava/org/mockitoinline/StaticRuleTest.java b/...ava/org/mockitoinline/StaticRuleTest.java → ...ava/org/mockitoinline/StaticRuleTest.java
diff --git a/...a/org/mockitoinline/StaticRunnerTest.java → ...a/org/mockitoinline/StaticRunnerTest.java b/...a/org/mockitoinline/StaticRunnerTest.java → ...a/org/mockitoinline/StaticRunnerTest.java
diff --git a/...st/java/org/mockitoinline/StressTest.java → ...st/java/org/mockitoinline/StressTest.java b/...st/java/org/mockitoinline/StressTest.java → ...st/java/org/mockitoinline/StressTest.java
diff --git a/...g/mockitoinline/StubbingLocationTest.java → ...g/mockitoinline/StubbingLocationTest.java b/...g/mockitoinline/StubbingLocationTest.java → ...g/mockitoinline/StubbingLocationTest.java
diff --git a/...mockitoinline/SubconstructorMockTest.java → ...mockitoinline/SubconstructorMockTest.java b/...mockitoinline/SubconstructorMockTest.java → ...mockitoinline/SubconstructorMockTest.java
diff --git a/...java/org/mockitoinline/SuperCallTest.java → ...java/org/mockitoinline/SuperCallTest.java b/...java/org/mockitoinline/SuperCallTest.java → ...java/org/mockitoinline/SuperCallTest.java
diff --git a/...clicMockMethodArgumentMemoryLeakTest.java → ...clicMockMethodArgumentMemoryLeakTest.java b/...clicMockMethodArgumentMemoryLeakTest.java → ...clicMockMethodArgumentMemoryLeakTest.java
diff --git a/...kitoinline/bugs/OngoingStubShiftTest.java → ...kitoinline/bugs/OngoingStubShiftTest.java b/...kitoinline/bugs/OngoingStubShiftTest.java → ...kitoinline/bugs/OngoingStubShiftTest.java
diff --git a/.../bugs/SelfSpyReferenceMemoryLeakTest.java → .../bugs/SelfSpyReferenceMemoryLeakTest.java b/.../bugs/SelfSpyReferenceMemoryLeakTest.java → .../bugs/SelfSpyReferenceMemoryLeakTest.java