Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Mar 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion settings.gradle.kts
Expand Up @@ -3,7 +3,7 @@ plugins {
}

include("subclass",
"inline",
TimvdLippe marked this conversation as resolved.
Show resolved Hide resolved
"inlineTest",
"proxy",
"extTest",
"groovyTest",
Expand Down
2 changes: 1 addition & 1 deletion subprojects/androidTest/androidTest.gradle
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion subprojects/groovyInlineTest/groovyInlineTest.gradle
Expand Up @@ -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
}

This file was deleted.

This file was deleted.

@@ -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'
}