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

…ubproject
krzyk · Mar 17, 2023 · daecb70 · daecb70
1 parent b6861e3
commit daecb70
Show file tree

Hide file tree

Showing 28 changed files with 2 additions and 1,352 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,11 +3,9 @@ plugins {
 }
 
 include("subclass",
-    "inline",
     "proxy",
     "extTest",
     "groovyTest",
-    "groovyInlineTest",
     "kotlinTest",
     "kotlinReleaseCoroutinesTest",
     "android",

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/inline.gradle b/subprojects/inline/inline.gradle
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/src/test/java/org/mockitoinline/ConstructionMockRuleTest.java b/subprojects/inline/src/test/java/org/mockitoinline/ConstructionMockRuleTest.java
diff --git a/subprojects/inline/src/test/java/org/mockitoinline/ConstructionMockTest.java b/subprojects/inline/src/test/java/org/mockitoinline/ConstructionMockTest.java
diff --git a/subprojects/inline/src/test/java/org/mockitoinline/EnumMockingTest.java b/subprojects/inline/src/test/java/org/mockitoinline/EnumMockingTest.java
diff --git a/subprojects/inline/src/test/java/org/mockitoinline/FinalClassMockingTest.java b/subprojects/inline/src/test/java/org/mockitoinline/FinalClassMockingTest.java
diff --git a/subprojects/inline/src/test/java/org/mockitoinline/HierarchyPreInitializationTest.java b/subprojects/inline/src/test/java/org/mockitoinline/HierarchyPreInitializationTest.java