From 012190fbfd049f56637b1039f4ae1f69becea881 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 1 Jul 2020 17:38:49 +0200
Subject: Gradle integration tests: Use dokka_it_kotlin_version over
 kotlin_version

---
 integration-tests/gradle/projects/it-basic/build.gradle.kts    | 4 +---
 integration-tests/gradle/projects/it-basic/gradle.properties   | 1 +
 integration-tests/gradle/projects/it-basic/settings.gradle.kts | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 integration-tests/gradle/projects/it-basic/gradle.properties

(limited to 'integration-tests/gradle/projects/it-basic')

diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index 3e451fd3..80c2bbea 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.dokka.gradle.dokka
-
 plugins {
     kotlin("jvm")
     id("org.jetbrains.dokka")
@@ -18,5 +16,5 @@ dependencies {
 
 afterEvaluate {
     logger.quiet("Gradle version: ${gradle.gradleVersion}")
-    logger.quiet("Kotlin version: ${findProperty("kotlin_version")}")
+    logger.quiet("Kotlin version: ${properties["dokka_it_kotlin_version"]}")
 }
diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties
new file mode 100644
index 00000000..7ebac3ad
--- /dev/null
+++ b/integration-tests/gradle/projects/it-basic/gradle.properties
@@ -0,0 +1 @@
+dokka_it_kotlin_version=1.3.72
diff --git a/integration-tests/gradle/projects/it-basic/settings.gradle.kts b/integration-tests/gradle/projects/it-basic/settings.gradle.kts
index 9bfd026f..10447365 100644
--- a/integration-tests/gradle/projects/it-basic/settings.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/settings.gradle.kts
@@ -1,11 +1,11 @@
 @file:Suppress("LocalVariableName", "UnstableApiUsage")
 
 pluginManagement {
-    val kotlin_version = "1.3.72"
+    val dokka_it_kotlin_version: String by settings
     val dokka_version = "0.11.0-SNAPSHOT"
 
     plugins {
-        id("org.jetbrains.kotlin.jvm") version kotlin_version
+        id("org.jetbrains.kotlin.jvm") version dokka_it_kotlin_version
         id("org.jetbrains.dokka") version dokka_version
     }
 
-- 
cgit