diff options
Diffstat (limited to 'integration-tests/gradle-integration-tests')
4 files changed, 34 insertions, 12 deletions
diff --git a/integration-tests/gradle-integration-tests/build.gradle.kts b/integration-tests/gradle-integration-tests/build.gradle.kts index 7cb96738..4db0f976 100644 --- a/integration-tests/gradle-integration-tests/build.gradle.kts +++ b/integration-tests/gradle-integration-tests/build.gradle.kts @@ -40,6 +40,5 @@ tasks { test { systemProperty("android.licenses.overwrite", project.findProperty("android.licenses.overwrite") ?: "") inputs.dir(file("testData")) - exclude("*") // TODO: Remove this exclude when tests are migrated } } diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt index 2e1a0d41..38516b48 100644 --- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt +++ b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt @@ -37,15 +37,24 @@ class BasicTest : AbstractDokkaGradleTest() { """<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a>""") } - @Test fun `test kotlin 1_0_7 and gradle 2_14_1`() { - doTest("2.14.1", "1.0.7") + @Test + fun `test gradle 6_5_1 kotlin 1_3_72`() { + doTest(gradleVersion = "6.5.1", kotlinVersion = "1.3.72") } - @Test fun `test kotlin 1_1_2 and gradle 4_0`() { - doTest("4.0", "1.1.2") + @Test + fun `test gradle 6_5_0 kotlin 1_3_72`() { + doTest(gradleVersion = "6.5.0", kotlinVersion = "1.3.72") } - @Test fun `test kotlin 1_2_20 and gradle 4_5`() { - doTest("4.5", "1.2.20") + @Test + fun `test gradle 5_6_4 kotlin 1_3_72`() { + doTest(gradleVersion = "5.6.4", kotlinVersion = "1.3.72") } -}
\ No newline at end of file + + @Test + fun `test gradle 5_6_4 kotlin 1_3_30`() { + doTest(gradleVersion = "5.6.4", kotlinVersion = "1.3.30") + } + +} diff --git a/integration-tests/gradle-integration-tests/testData/basic/build.gradle b/integration-tests/gradle-integration-tests/testData/basic/build.gradle index 79645204..18c617b7 100644 --- a/integration-tests/gradle-integration-tests/testData/basic/build.gradle +++ b/integration-tests/gradle-integration-tests/testData/basic/build.gradle @@ -2,7 +2,8 @@ buildscript { repositories { mavenCentral() jcenter() - maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" } + mavenLocal() + maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } } dependencies { @@ -21,7 +22,7 @@ repositories { mavenCentral() jcenter() maven { - url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" + url "https://dl.bintray.com/kotlin/kotlin-eap" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" @@ -35,8 +36,11 @@ dependencies { } +/* dokka { configuration { classpath += "$projectDir/classDir" } -}
\ No newline at end of file +} + + */ diff --git a/integration-tests/gradle-integration-tests/testData/basic/settings.gradle b/integration-tests/gradle-integration-tests/testData/basic/settings.gradle index c36a146c..a0498790 100644 --- a/integration-tests/gradle-integration-tests/testData/basic/settings.gradle +++ b/integration-tests/gradle-integration-tests/testData/basic/settings.gradle @@ -1 +1,11 @@ -rootProject.name = "basic"
\ No newline at end of file +pluginManagement { + repositories { + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev/' } + mavenLocal() + mavenCentral() + jcenter() + gradlePluginPortal() + } +} + +rootProject.name = "basic" |