Skip to content

Commit f52da3b

Browse files
mannodermausmannodermaus
committed
Remove usages of old AGP DSL
1 parent ae61075 commit f52da3b

13 files changed

Lines changed: 151 additions & 158 deletions

File tree

‎plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/PluginConfig.kt‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,16 @@ package de.mannodermaus.gradle.plugins.junit5.internal.config
55
import com.android.build.api.dsl.CommonExtension
66
import com.android.build.api.variant.AndroidComponentsExtension
77
import com.android.build.api.variant.Variant
8-
import com.android.build.gradle.AppExtension
9-
import com.android.build.gradle.AppPlugin
10-
import com.android.build.gradle.BaseExtension
118
import com.android.build.gradle.BasePlugin
12-
import com.android.build.gradle.DynamicFeaturePlugin
13-
import com.android.build.gradle.LibraryExtension
14-
import com.android.build.gradle.LibraryPlugin
159
import com.android.build.gradle.api.BaseVariant
1610
import de.mannodermaus.gradle.plugins.junit5.internal.providers.DirectoryProvider
1711
import de.mannodermaus.gradle.plugins.junit5.internal.providers.JavaDirectoryProvider
1812
import de.mannodermaus.gradle.plugins.junit5.internal.providers.KotlinDirectoryProvider
19-
import org.gradle.api.DomainObjectSet
2013
import org.gradle.api.Project
2114

2215
internal class PluginConfig
2316
private constructor(
2417
private val project: Project,
25-
private val legacyVariants: DomainObjectSet<out BaseVariant>,
2618
private val componentsExtension: AndroidComponentsExtension<*, *, *>
2719
) {
2820

@@ -32,18 +24,7 @@ private constructor(
3224
.findByName("androidComponents") as? AndroidComponentsExtension<*, *, *>
3325
?: return null
3426

35-
val legacyExtension = project.extensions
36-
.findByName("android") as? BaseExtension
37-
?: return null
38-
39-
val legacyVariants = when (plugin) {
40-
is AppPlugin -> (legacyExtension as AppExtension).applicationVariants
41-
is LibraryPlugin -> (legacyExtension as LibraryExtension).libraryVariants
42-
is DynamicFeaturePlugin -> (legacyExtension as AppExtension).applicationVariants
43-
else -> return null
44-
}
45-
46-
return PluginConfig(project, legacyVariants, componentsExtension)
27+
return PluginConfig(project, componentsExtension)
4728
}
4829
}
4930

@@ -63,9 +44,12 @@ private constructor(
6344
fun directoryProvidersOf(variant: Variant): Set<DirectoryProvider> {
6445
// Locate the legacy variant for the given one, since the new API
6546
// does not give access to variant-specific source sets and class outputs
66-
return legacyVariants.firstOrNull { it.name == variant.name }
67-
?.run { directoryProvidersOf(this) }
68-
?: emptySet()
47+
// return legacyVariants.firstOrNull { it.name == variant.name }
48+
// ?.run { directoryProvidersOf(this) }
49+
// ?: emptySet()
50+
// TODO What to do here?
51+
// https://issuetracker.google.com/issues/443225252
52+
return emptySet()
6953
}
7054

7155
/* Private */

‎plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/configureJUnit5.kt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import de.mannodermaus.gradle.plugins.junit5.dsl.AndroidJUnitPlatformExtension
1111
import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT5_RUNNER_BUILDER_CLASS
1212
import de.mannodermaus.gradle.plugins.junit5.internal.config.JUnit5TaskConfig
1313
import de.mannodermaus.gradle.plugins.junit5.internal.config.PluginConfig
14-
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.android
1514
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.getAsList
1615
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.getTaskName
1716
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.instrumentationTestVariant
@@ -97,16 +96,7 @@ private fun AndroidJUnitPlatformExtension.prepareUnitTests(project: Project, and
9796
// so that consumers don't need to do this explicitly
9897
val options = excludedPackagingOptions()
9998

100-
try {
101-
android.packaging.resources.excludes.addAll(options)
102-
} catch (e: NoSuchMethodError) {
103-
// TODO Because of https://issuetracker.google.com/issues/263387063,
104-
// there is a breaking API change in AGP 8.x that causes a NoSuchMethodError
105-
// (renaming PackagingOptions to Packaging without any fallback).
106-
// Fall back to the old DSL when this happens
107-
options.forEach(project.android.packagingOptions::exclude)
108-
}
109-
99+
android.packaging.resources.excludes.addAll(options)
110100
attachDependencies(project, "testImplementation", includeRunner = false)
111101
}
112102

‎plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/extensions/ProjectExt.kt‎

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

3-
import com.android.build.gradle.BaseExtension
43
import com.android.build.gradle.BasePlugin
54
import de.mannodermaus.gradle.plugins.junit5.dsl.AndroidJUnitPlatformExtension
65
import de.mannodermaus.gradle.plugins.junit5.internal.config.EXTENSION_NAME
76
import org.gradle.api.Project
87
import org.gradle.api.artifacts.Dependency
98
import java.util.concurrent.atomic.AtomicBoolean
109
import kotlin.contracts.ExperimentalContracts
11-
import kotlin.contracts.InvocationKind
12-
import kotlin.contracts.contract
1310

1411
internal val Project.junitPlatform
1512
get() = extensionByName<AndroidJUnitPlatformExtension>(EXTENSION_NAME)
1613

17-
internal val Project.android
18-
get() = extensionByName<BaseExtension>("android")
19-
2014
@OptIn(ExperimentalContracts::class)
2115
internal fun Project.whenAndroidPluginAdded(block: (BasePlugin) -> Unit) {
2216
val configured = AtomicBoolean(false)

‎plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/extensions/AgpExtensions.kt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package de.mannodermaus.gradle.plugins.junit5.extensions
2+
3+
import com.android.build.api.dsl.ApplicationExtension
4+
import com.android.build.api.dsl.CommonExtension
5+
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.extensionByName
6+
import org.gradle.api.Project
7+
8+
internal val Project.android
9+
get() = extensionByName<CommonExtension<*, *, *, *, *>>("android")
10+
11+
internal val Project.androidApp
12+
get() = extensionByName<ApplicationExtension>("android")

‎plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/AgpFilterTests.kt‎

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

33
import com.google.common.truth.Truth.assertThat
4-
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.android
4+
import de.mannodermaus.gradle.plugins.junit5.extensions.android
5+
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.capitalized
56
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
67
import de.mannodermaus.gradle.plugins.junit5.util.evaluate
78
import de.mannodermaus.gradle.plugins.junit5.util.get
@@ -35,7 +36,7 @@ interface AgpFilterTests : AgpVariantAwareTests {
3536
}
3637
}
3738
) { project, buildType ->
38-
val task = project.tasks.get<Test>("test${buildType.capitalize()}UnitTest")
39+
val task = project.tasks.get<Test>("test${buildType.capitalized()}UnitTest")
3940
assertThat(task.junitPlatformOptions.includeTags).contains("global-include-tag")
4041
assertThat(task.junitPlatformOptions.excludeTags).contains("global-exclude-tag")
4142
assertThat(task.junitPlatformOptions.includeEngines).contains("global-include-engine")
@@ -48,8 +49,8 @@ interface AgpFilterTests : AgpVariantAwareTests {
4849
fun `using custom build types & multiple flavor dimensions`(): List<DynamicTest> {
4950
val project = createProject().build()
5051
project.registerProductFlavors(advancedFlavorList)
51-
project.android.buildTypes { container ->
52-
container.create("ci").initWith(container.getByName("debug"))
52+
with(project.android.buildTypes) {
53+
create("ci").initWith(getByName("debug"))
5354
}
5455
project.evaluate()
5556

‎plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/AgpInstrumentationSupportTests.kt‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package de.mannodermaus.gradle.plugins.junit5.plugin
22

33
import com.android.build.gradle.TestedExtension
44
import com.google.common.truth.Truth.assertThat
5-
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.android
5+
import de.mannodermaus.gradle.plugins.junit5.extensions.android
66
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
77
import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5WriteFilters
88
import de.mannodermaus.gradle.plugins.junit5.util.assertAll
@@ -41,19 +41,19 @@ interface AgpInstrumentationSupportTests : AgpVariantAwareTests {
4141
project.evaluate()
4242

4343
return listOf(
44-
dynamicTest("has a task for writing the debug filters DSL to a resource file") {
45-
val task = project.tasks.get<AndroidJUnit5WriteFilters>("writeFiltersDebugAndroidTest")
46-
assertAll(
47-
{ assertThat(task).isNotNull() },
48-
{ assertThat(task.includeTags.get()).containsExactly("global-include-tag") },
49-
{ assertThat(task.excludeTags.get()).containsExactly("debug-exclude-tag") }
50-
)
51-
},
44+
dynamicTest("has a task for writing the debug filters DSL to a resource file") {
45+
val task = project.tasks.get<AndroidJUnit5WriteFilters>("writeFiltersDebugAndroidTest")
46+
assertAll(
47+
{ assertThat(task).isNotNull() },
48+
{ assertThat(task.includeTags.get()).containsExactly("global-include-tag") },
49+
{ assertThat(task.excludeTags.get()).containsExactly("debug-exclude-tag") }
50+
)
51+
},
5252

53-
dynamicTest("has no task for writing the release DSL to a resource file") {
54-
val task = project.tasks.findByName("writeFiltersReleaseAndroidTest")
55-
assertThat(task).isNull()
56-
}
53+
dynamicTest("has no task for writing the release DSL to a resource file") {
54+
val task = project.tasks.findByName("writeFiltersReleaseAndroidTest")
55+
assertThat(task).isNull()
56+
}
5757
)
5858
}
5959

@@ -96,31 +96,31 @@ interface AgpInstrumentationSupportTests : AgpVariantAwareTests {
9696
project.evaluate()
9797

9898
return listOf(
99-
dynamicTest("has a task for writing the freeDebug filters DSL to a resource file") {
100-
val task = project.tasks.get<AndroidJUnit5WriteFilters>("writeFiltersFreeDebugAndroidTest")
101-
assertThat(task).isNotNull()
102-
assertThat(task.includeTags.get()).containsExactly("global-include-tag", "freeDebug-include-tag")
103-
assertThat(task.excludeTags.get()).containsExactly("global-exclude-tag")
104-
},
99+
dynamicTest("has a task for writing the freeDebug filters DSL to a resource file") {
100+
val task = project.tasks.get<AndroidJUnit5WriteFilters>("writeFiltersFreeDebugAndroidTest")
101+
assertThat(task).isNotNull()
102+
assertThat(task.includeTags.get()).containsExactly("global-include-tag", "freeDebug-include-tag")
103+
assertThat(task.excludeTags.get()).containsExactly("global-exclude-tag")
104+
},
105105

106-
dynamicTest("has a task for writing the paidDebug filters DSL to a resource file") {
107-
val task = project.tasks.get<AndroidJUnit5WriteFilters>("writeFiltersPaidDebugAndroidTest")
108-
assertThat(task).isNotNull()
109-
assertThat(task.includeTags.get()).containsExactly("global-include-tag")
110-
assertThat(task.excludeTags.get()).containsExactly("global-exclude-tag")
111-
},
106+
dynamicTest("has a task for writing the paidDebug filters DSL to a resource file") {
107+
val task = project.tasks.get<AndroidJUnit5WriteFilters>("writeFiltersPaidDebugAndroidTest")
108+
assertThat(task).isNotNull()
109+
assertThat(task.includeTags.get()).containsExactly("global-include-tag")
110+
assertThat(task.excludeTags.get()).containsExactly("global-exclude-tag")
111+
},
112112

113-
dynamicTest("doesn't have tasks for writing the release filters DSL to a resource file") {
114-
assertThat(project.tasks.findByName("writeFiltersFreeReleaseAndroidTest")).isNull()
115-
assertThat(project.tasks.findByName("writeFiltersPaidReleaseAndroidTest")).isNull()
116-
}
113+
dynamicTest("doesn't have tasks for writing the release filters DSL to a resource file") {
114+
assertThat(project.tasks.findByName("writeFiltersFreeReleaseAndroidTest")).isNull()
115+
assertThat(project.tasks.findByName("writeFiltersPaidReleaseAndroidTest")).isNull()
116+
}
117117
)
118118
}
119119
}
120120

121121
private fun Project.setupInstrumentationTests() {
122122
android.defaultConfig {
123-
it.testInstrumentationRunnerArgument("runnerBuilder", "de.mannodermaus.junit5.AndroidJUnit5Builder")
123+
testInstrumentationRunnerArguments["runnerBuilder"] = "de.mannodermaus.junit5.AndroidJUnit5Builder"
124124
}
125125
dependencies.add("androidTestRuntimeOnly", "de.mannodermaus.junit5:android-test-runner:+")
126126
}

0 commit comments

Comments
 (0)