From 95f21075fef8d7efab78841696a504c3bf65d900 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 25 Jan 2023 23:38:55 +0100 Subject: [PATCH] Inline project with kotlin-native path settings --- libraries/tools/kotlin-stdlib-docs/build.gradle | 3 +-- .../tools/kotlin-stdlib-docs/kotlin_big/build.gradle | 2 +- .../kotlin-stdlib-docs/kotlin_native/build.gradle | 10 ---------- libraries/tools/kotlin-stdlib-docs/settings.gradle | 1 - 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 libraries/tools/kotlin-stdlib-docs/kotlin_native/build.gradle diff --git a/libraries/tools/kotlin-stdlib-docs/build.gradle b/libraries/tools/kotlin-stdlib-docs/build.gradle index 9021bfb6ab8..529c5126bf3 100644 --- a/libraries/tools/kotlin-stdlib-docs/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/build.gradle @@ -10,14 +10,13 @@ plugins { evaluationDependsOnChildren() def pKotlinBig() { return project('kotlin_big').extensions } -def pKotlinNative() { return project('kotlin_native').extensions } ext.outputDir = "$buildDir/doc" ext.outputDirLatest = "$outputDir/latest" ext.outputDirPrevious = "$outputDir/previous" ext.kotlin_root = pKotlinBig().kotlin_root ext.kotlin_libs = pKotlinBig().kotlin_libs -ext.kotlin_native_root = pKotlinNative().kotlin_native_root +ext.kotlin_native_root = file("$kotlin_root/kotlin-native").absolutePath ext.github_revision = pKotlinBig().github_revision ext.localRoot = kotlin_root ext.baseUrl = new URL("https://github.com/JetBrains/kotlin/tree/$github_revision") diff --git a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle index 88e2b390fec..7b8480acc6e 100644 --- a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'base' -final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null +final boolean isTeamcityBuild = project.hasProperty("teamcity.version") // kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin final String kotlinRootDir = rootProject.file("../../../").absolutePath.replace('\\', '/') diff --git a/libraries/tools/kotlin-stdlib-docs/kotlin_native/build.gradle b/libraries/tools/kotlin-stdlib-docs/kotlin_native/build.gradle deleted file mode 100644 index eb4ec7d044c..00000000000 --- a/libraries/tools/kotlin-stdlib-docs/kotlin_native/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'base' - -final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null - -// kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin/kotlin-native -final String kotlinNativeRootDir = rootProject.file("../../../kotlin-native").absolutePath -final String kotlinNativeLibsDir = isTeamcityBuild ? project.property("kotlinNativeDistDir") : "$kotlinNativeRootDir/dist" - -project.extensions.kotlin_native_root = kotlinNativeRootDir -project.extensions.kotlin_native_libs = kotlinNativeLibsDir diff --git a/libraries/tools/kotlin-stdlib-docs/settings.gradle b/libraries/tools/kotlin-stdlib-docs/settings.gradle index 65594ac7173..24954fd531d 100644 --- a/libraries/tools/kotlin-stdlib-docs/settings.gradle +++ b/libraries/tools/kotlin-stdlib-docs/settings.gradle @@ -13,7 +13,6 @@ pluginManagement { rootProject.name = 'kotlin-stdlib-docs' -include 'kotlin_native' include 'kotlin_big' include 'plugins:dokka-samples-transformer-plugin' include 'plugins:dokka-stdlib-configuration-plugin'