From 0389c3526299debe45bf1f4ab0e773c7dd6af7f1 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 23 Feb 2023 03:47:05 +0100 Subject: [PATCH] docs build: allow to specify custom dokka repository - centralize repository management in settings.gradle.kts - allow to specify dokka repository with a gradle property - automatically add mavenLocal for -local dokka versions - specify kotlin version for building plugins in one place --- .../tools/kotlin-stdlib-docs/build.gradle.kts | 5 --- .../plugins/build.gradle.kts | 3 ++ .../build.gradle | 16 +++------ .../build.gradle | 16 +++------ .../dokka-version-filter-plugin/build.gradle | 16 +++------ .../tools/kotlin-stdlib-docs/settings.gradle | 19 ---------- .../kotlin-stdlib-docs/settings.gradle.kts | 35 +++++++++++++++++++ 7 files changed, 50 insertions(+), 60 deletions(-) create mode 100644 libraries/tools/kotlin-stdlib-docs/plugins/build.gradle.kts delete mode 100644 libraries/tools/kotlin-stdlib-docs/settings.gradle create mode 100644 libraries/tools/kotlin-stdlib-docs/settings.gradle.kts diff --git a/libraries/tools/kotlin-stdlib-docs/build.gradle.kts b/libraries/tools/kotlin-stdlib-docs/build.gradle.kts index b107fcb059119..fc4dd3ab3663d 100644 --- a/libraries/tools/kotlin-stdlib-docs/build.gradle.kts +++ b/libraries/tools/kotlin-stdlib-docs/build.gradle.kts @@ -50,11 +50,6 @@ val prepare by tasks.registering { dependsOn(":kotlin_big:extractLibs") } -repositories { - mavenCentral() - maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev") -} - dependencies { dokkaPlugin(project(":plugins:dokka-samples-transformer-plugin")) dokkaPlugin(project(":plugins:dokka-stdlib-configuration-plugin")) diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/build.gradle.kts b/libraries/tools/kotlin-stdlib-docs/plugins/build.gradle.kts new file mode 100644 index 0000000000000..cb87f443b5286 --- /dev/null +++ b/libraries/tools/kotlin-stdlib-docs/plugins/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.jetbrains.kotlin.jvm") version "1.8.0" apply false +} diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle index 78634a3b8257e..6f6e9b9175ac5 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle @@ -1,17 +1,9 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.8.0' + id 'org.jetbrains.kotlin.jvm' } description "Dokka Plugin to transform the samples from stdlib" -repositories { - mavenCentral() - maven { - url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' - } - mavenLocal() -} - -final String dokka_version = findProperty("dokka_version") +final String dokka_version = property("dokka_version") dependencies { implementation "org.jetbrains.dokka:dokka-base:$dokka_version" @@ -19,7 +11,7 @@ dependencies { compileOnly "org.jetbrains.dokka:dokka-analysis:$dokka_version" } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { - kotlinOptions.jvmTarget = "1.8" +kotlin { + jvmToolchain(8) } diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle index 6f793ba4b3c1a..31edc097c8c62 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle @@ -1,17 +1,9 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.8.0' + id 'org.jetbrains.kotlin.jvm' } description "Dokka Plugin to configure Dokka for stdlib" -repositories { - mavenCentral() - maven { - url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' - } - mavenLocal() -} - -final String dokka_version = findProperty("dokka_version") +final String dokka_version = property("dokka_version") dependencies { implementation "org.jetbrains.dokka:dokka-base:$dokka_version" @@ -19,7 +11,7 @@ dependencies { compileOnly "org.jetbrains.dokka:dokka-analysis:$dokka_version" } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { - kotlinOptions.jvmTarget = "1.8" +kotlin { + jvmToolchain(8) } diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle index 30e50754c660d..7e57edce545b4 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle @@ -1,17 +1,9 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.8.0' + id 'org.jetbrains.kotlin.jvm' } description "Dokka Plugin to filter version for stdlib" -repositories { - mavenCentral() - maven { - url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' - } - mavenLocal() -} - -final String dokka_version = findProperty("dokka_version") +final String dokka_version = property("dokka_version") dependencies { implementation "org.jetbrains.dokka:dokka-base:$dokka_version" @@ -19,8 +11,8 @@ dependencies { compileOnly "org.jetbrains.dokka:dokka-analysis:$dokka_version" testImplementation 'org.jetbrains.kotlin:kotlin-test'} -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { - kotlinOptions.jvmTarget = "1.8" +kotlin { + jvmToolchain(8) } test { useJUnitPlatform() diff --git a/libraries/tools/kotlin-stdlib-docs/settings.gradle b/libraries/tools/kotlin-stdlib-docs/settings.gradle deleted file mode 100644 index 24954fd531d61..0000000000000 --- a/libraries/tools/kotlin-stdlib-docs/settings.gradle +++ /dev/null @@ -1,19 +0,0 @@ -pluginManagement { - plugins { - id("org.jetbrains.dokka") version(dokka_version) - } - - repositories { - gradlePluginPortal() - maven { - url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' - } - } -} - -rootProject.name = 'kotlin-stdlib-docs' - -include 'kotlin_big' -include 'plugins:dokka-samples-transformer-plugin' -include 'plugins:dokka-stdlib-configuration-plugin' -include 'plugins:dokka-version-filter-plugin' diff --git a/libraries/tools/kotlin-stdlib-docs/settings.gradle.kts b/libraries/tools/kotlin-stdlib-docs/settings.gradle.kts new file mode 100644 index 0000000000000..cd01571402a35 --- /dev/null +++ b/libraries/tools/kotlin-stdlib-docs/settings.gradle.kts @@ -0,0 +1,35 @@ +pluginManagement { + val dokkaVersion = providers.gradleProperty("dokka_version").get() + val dokkaRepository = providers.gradleProperty("dokka_repository").getOrElse("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev") + plugins { + id("org.jetbrains.dokka") version(dokkaVersion) + } + + repositories { + gradlePluginPortal() + maven(url = dokkaRepository) + if ("-local" in dokkaVersion) { + mavenLocal() + } + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.PREFER_PROJECT) + val dokkaVersion = providers.gradleProperty("dokka_version").get() + val dokkaRepository = providers.gradleProperty("dokka_repository").getOrElse("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev") + repositories { + mavenCentral() + maven(url = dokkaRepository) + if ("-local" in dokkaVersion) { + mavenLocal() + } + } +} + +rootProject.name = "kotlin-stdlib-docs" + +include("kotlin_big") +include("plugins") +include("plugins:dokka-samples-transformer-plugin") +include("plugins:dokka-stdlib-configuration-plugin") +include("plugins:dokka-version-filter-plugin")