diff --git a/settings.gradle.kts b/settings.gradle.kts index 5806de0315..d4751d4fd0 100644 --- 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 index 941a52b9cc..072c222639 100644 --- 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 index 1618ac6009..16e95a9118 100644 --- 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 deleted file mode 100644 index 1422f9900b..0000000000 --- a/subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor +++ /dev/null @@ -1 +0,0 @@ -member-accessor-module 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 deleted file mode 100644 index ca6ee9cea8..0000000000 --- a/subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file