Skip to content

Commit a0940ee

Browse files
committed
Always include junit5-rt
1 parent 1d453ed commit a0940ee

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformPlugin.groovy

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
8484
def platformVersion = junitExtension.platformVersion
8585
def vintageVersion = junitExtension.vintageVersion
8686

87-
def libraries = [
87+
return [
8888
project.dependencies.create("junit:junit:4.12"),
8989
project.dependencies.create("org.junit.jupiter:junit-jupiter-api:${jupiterVersion}"),
9090
project.dependencies.create("org.junit.platform:junit-platform-engine:${platformVersion}"),
@@ -95,14 +95,10 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
9595
project.dependencies.create("org.junit.platform:junit-platform-console:$platformVersion"),
9696
project.dependencies.create("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion"),
9797
project.dependencies.create("org.junit.vintage:junit-vintage-engine:$vintageVersion"),
98-
]
99-
100-
if (project.properties["android.injected.invoked.from.ide"] == true) {
101-
// Android Studio build: Include the JUnit 5 Runtime JAR manually
102-
libraries += project.dependencies.create(project.files("libs/junit5-rt.jar"))
103-
}
10498

105-
return libraries
99+
// IntelliJ JUnit 5 Runtime, bundled to compensate for outdated Android Studio builds
100+
project.dependencies.create(files("libs/junit5-rt.jar"))
101+
]
106102
}
107103

108104
project.dependencies.ext.junit5Params = {

0 commit comments

Comments
 (0)