Skip to content

Commit c7c52b9

Browse files
committed
Replace AGP-internal interface to achieve better compatibility
1 parent 76f4121 commit c7c52b9

File tree

1 file changed

+7
-6
lines changed
  • android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks

1 file changed

+7
-6
lines changed

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks/Jacoco.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package de.mannodermaus.gradle.plugins.junit5.tasks
22

33
import com.android.build.gradle.api.BaseVariant
4-
import com.android.build.gradle.internal.scope.TaskConfigAction
54
import de.mannodermaus.gradle.plugins.junit5.internal.android
65
import de.mannodermaus.gradle.plugins.junit5.internal.extensionByName
76
import de.mannodermaus.gradle.plugins.junit5.internal.junit5Info
@@ -34,7 +33,9 @@ open class AndroidJUnit5JacocoReport : JacocoReport() {
3433
testTask: Test,
3534
directoryProviders: Collection<DirectoryProvider>): AndroidJUnit5JacocoReport {
3635
val configAction = ConfigAction(project, variant, testTask, directoryProviders)
37-
return project.tasks.create(configAction.name, configAction.type, configAction)
36+
return project.tasks.create(configAction.name, configAction.type) {
37+
configAction.execute(it)
38+
}
3839
}
3940
}
4041

@@ -46,15 +47,15 @@ open class AndroidJUnit5JacocoReport : JacocoReport() {
4647
val variant: BaseVariant,
4748
val testTask: Test,
4849
private val directoryProviders: Collection<DirectoryProvider>
49-
) : TaskConfigAction<AndroidJUnit5JacocoReport> {
50+
) {
5051

5152
private val scope = variant.variantData.scope
5253

53-
override fun getName(): String = scope.getTaskName(TASK_NAME_DEFAULT)
54+
val name: String = scope.getTaskName(TASK_NAME_DEFAULT)
5455

55-
override fun getType() = AndroidJUnit5JacocoReport::class.java
56+
val type = AndroidJUnit5JacocoReport::class.java
5657

57-
override fun execute(reportTask: AndroidJUnit5JacocoReport) {
58+
fun execute(reportTask: AndroidJUnit5JacocoReport) {
5859
// Project-level configuration
5960
reportTask.dependsOn(testTask)
6061
reportTask.group = GROUP_REPORTING

0 commit comments

Comments
 (0)