Skip to content

Commit 36c3318

Browse files
committed
Removed previously deprecated junitVintage() dependency handler
1 parent 218d1ba commit 36c3318

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
2020

2121
static final String LOG_TAG = "[android-junit5]"
2222

23-
private static final String VINTAGE_WARNING =
24-
"AGPBI: {" +
25-
'"kind":"warning",' +
26-
'"text":' + "\"$LOG_TAG You don't need to depend on junitVintage() directly anymore!\"," +
27-
'"sources":[{},{}]' +
28-
'}'
29-
3023
static final String EXTENSION_NAME = 'junitPlatform'
3124

3225
/**
@@ -100,12 +93,6 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
10093
return project.dependencies.create("org.junit.jupiter:junit-jupiter-params:${jupiterVersion}")
10194
}
10295

103-
// Add a junitVintage() dependency handler
104-
project.dependencies.ext.junitVintage = {
105-
project.logger.warn(VINTAGE_WARNING)
106-
return []
107-
}
108-
10996
project.afterEvaluate {
11097
configure(project)
11198
}

android-junit5/src/test/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformSpec.groovy

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -243,45 +243,6 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
243243
p.tasks.getByName("junitPlatformTestPaidRelease")
244244
}
245245

246-
def "show warning if depending on junitVintage() directly"() {
247-
when:
248-
Project p = ProjectBuilder.builder().withParent(testRoot).build()
249-
250-
p.file(".").mkdir()
251-
p.file("src/main").mkdirs()
252-
p.file("src/main/AndroidManifest.xml").withWriter { it.write(ANDROID_MANIFEST) }
253-
254-
p.apply plugin: 'com.android.application'
255-
p.apply plugin: 'de.mannodermaus.android-junit5'
256-
p.android {
257-
compileSdkVersion COMPILE_SDK
258-
buildToolsVersion BUILD_TOOLS
259-
260-
defaultConfig {
261-
applicationId APPLICATION_ID
262-
minSdkVersion MIN_SDK
263-
targetSdkVersion TARGET_SDK
264-
versionCode VERSION_CODE
265-
versionName VERSION_NAME
266-
}
267-
}
268-
p.repositories {
269-
jcenter()
270-
}
271-
p.dependencies {
272-
// "testCompile" or "testApi"
273-
invokeMethod(testCompileDependency(), junitJupiter())
274-
// "testApk" or "testRuntimeOnly"
275-
invokeMethod(testRuntimeDependency(), junitVintage())
276-
}
277-
278-
then:
279-
p.evaluate()
280-
// Unsure how to capture the output directly
281-
// (Project.logging listeners don't seem to work)
282-
assert true == true
283-
}
284-
285246
@IgnoreIf({AndroidJUnitPlatformSpec.isAgp3x()})
286247
def "custom junit jupiter version"() {
287248
when:

0 commit comments

Comments
 (0)