Skip to content

Commit e78813c

Browse files
authored
DGP integration tests: Move @WithGradleProperties to tags (#4357)
Move the `@WithGradleProperties` defaults to the tags that require them. The test classes are simpler. (This will become more relevant when we need to test AGP9 with built-in-kotlin.)
1 parent 690a5ad commit e78813c

File tree

4 files changed

+2
-3
lines changed

4 files changed

+2
-3
lines changed

dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/junit/testTags.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ annotation class TestsKotlinJvm
5959
@Target(FUNCTION, CLASS)
6060
@MustBeDocumented
6161
@Inherited
62+
@WithGradleProperties(GradlePropertiesProvider.Android::class)
6263
annotation class TestsAndroid
6364

6465

@@ -74,4 +75,5 @@ annotation class TestsAndroid
7475
@Target(FUNCTION, CLASS)
7576
@MustBeDocumented
7677
@Inherited
78+
@WithGradleProperties(GradlePropertiesProvider.Android::class)
7779
annotation class TestsAndroidCompose

dokka-integration-tests/gradle/src/test/kotlin/AndroidComposeIT.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import kotlin.io.path.readText
2525
@TestsDGPv2
2626
@TestsAndroidCompose
2727
@TestsKotlinJvm
28-
@WithGradleProperties(GradlePropertiesProvider.Android::class)
2928
class AndroidComposeIT {
3029

3130
@DokkaGradlePluginTest(sourceProjectName = "it-android-compose")

dokka-integration-tests/gradle/src/test/kotlin/AndroidProjectIT.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import kotlin.io.path.readText
2525
@TestsAndroid
2626
@TestsDGPv2
2727
@TestsKotlinJvm
28-
@WithGradleProperties(GradlePropertiesProvider.Android::class)
2928
class AndroidProjectIT {
3029

3130
@DokkaGradlePluginTest(sourceProjectName = "it-android")

dokka-integration-tests/gradle/src/test/kotlin/MultiplatformAndroidJvmProjectIT.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import kotlin.io.path.readText
2121
*/
2222
@TestsAndroid
2323
@TestsDGPv2
24-
@WithGradleProperties(GradlePropertiesProvider.Android::class)
2524
@TestsKotlinMultiplatform
2625
class MultiplatformAndroidJvmProjectIT {
2726

0 commit comments

Comments
 (0)