aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle
diff options
context:
space:
mode:
Diffstat (limited to 'integration-tests/gradle')
-rw-r--r--integration-tests/gradle/build.gradle.kts10
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt14
2 files changed, 5 insertions, 19 deletions
diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index 28e20cf9..3da416bb 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.invokeWhenEvaluated
+import org.jetbrains.dependsOnMavenLocalPublication
dependencies {
implementation(kotlin("stdlib"))
@@ -8,13 +8,7 @@ dependencies {
tasks.integrationTest {
inputs.dir(file("projects"))
- rootProject.allprojects.forEach { otherProject ->
- otherProject.invokeWhenEvaluated { evaluatedProject ->
- evaluatedProject.tasks.findByName("publishToMavenLocal")?.let { publishingTask ->
- this.dependsOn(publishingTask)
- }
- }
- }
+ dependsOnMavenLocalPublication()
}
tasks.clean {
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt
index e08dbca5..0a29555f 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt
@@ -1,6 +1,8 @@
package org.jetbrains.dokka.it.gradle
import org.gradle.testkit.runner.TaskOutcome
+import org.jetbrains.dokka.it.isAndroidSdkInstalled
+import org.jetbrains.dokka.it.isCI
import org.junit.Assume
import org.junit.runners.Parameterized.Parameters
import java.io.File
@@ -28,20 +30,10 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
@BeforeTest
fun assumeAndroidInstallation() {
- val isCI = System.getenv("CI") != null
if (isCI) {
return
}
-
- val androidSdkRoot = System.getenv("ANDROID_SDK_ROOT")
- val androidHome = System.getenv("ANDROID_HOME")
-
- val isAndroidSdkInstalled = androidSdkRoot != null || androidHome != null
-
- Assume.assumeTrue(
- "Missing ANDROID_SDK_ROOT",
- isAndroidSdkInstalled
- )
+ Assume.assumeTrue("Missing ANDROID_SDK_ROOT", isAndroidSdkInstalled)
}
@BeforeTest