diff --git a/README.md b/README.md index c246cf70..3a90600f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![GitHub license](https://img.shields.io/github/license/adamko-dev/dokkatoo?style=for-the-badge)](https://github.com/adamko-dev/dokkatoo/blob/main/LICENSE) [![Gradle Plugin Portal](https://img.shields.io/gradle-plugin-portal/v/dev.adamko.dokkatoo?style=for-the-badge&logo=gradle)](https://plugins.gradle.org/search?term=dokkatoo) [![Maven Central](https://img.shields.io/maven-central/v/dev.adamko.dokkatoo/dokkatoo-plugin?style=for-the-badge&logo=apache-maven&color=6545e7&link=https%3A%2F%2Fsearch.maven.org%2Fsearch%3Fq%3Dg%3Adev.adamko.dokkatoo)](https://search.maven.org/search?q=g:dev.adamko.dokkatoo) -[![Maven metadata URL](https://img.shields.io/maven-metadata/v?label=MAVEN%20SNAPSHOT&metadataUrl=https%3A%2F%2Fs01.oss.sonatype.org%2Fcontent%2Frepositories%2Fsnapshots%2Fdev%2Fadamko%2Fdokkatoo%2Fdokkatoo-plugin%2Fmaven-metadata.xml&style=for-the-badge&logo=apache-maven)](https://s01.oss.sonatype.org/content/repositories/snapshots/dev/adamko/dokkatoo/dokkatoo-plugin/) +[![Maven Central Snapshots](https://img.shields.io/maven-metadata/v?label=MAVEN%20SNAPSHOT&metadataUrl=https%3A%2F%2Fs01.oss.sonatype.org%2Fcontent%2Frepositories%2Fsnapshots%2Fdev%2Fadamko%2Fdokkatoo%2Fdokkatoo-plugin%2Fmaven-metadata.xml&style=for-the-badge&logo=apache-maven)](https://s01.oss.sonatype.org/content/repositories/snapshots/dev/adamko/dokkatoo/dokkatoo-plugin/) [![Slack](https://img.shields.io/badge/slack-%23dokka-white.svg?&style=for-the-badge&logo=slack)](https://slack-chats.kotlinlang.org/c/dokka) @@ -14,6 +14,7 @@ for your Kotlin projects. Under the hood it uses [Dokka](https://github.com/Kotlin/dokka/), the API documentation engine for Kotlin. + ###### Why Dokkatoo? If @@ -28,20 +29,24 @@ Dokkatoo has a number of improvements over the existing Dokka Gradle Plugin: * Safe cross-project sharing and aggregation * Parallel execution + ### Status -Dokkatoo has basic functionality, and can generate documentation for single-projects and -multimodule projects. +Dokkatoo is used in production by many projects, and can generate documentation for single-module +and multimodule projects. + +[Dokkatoo has been merged into the Dokka codebase](https://github.com/Kotlin/dokka/pull/3188), +although as of December 2023 it has not been released. +Until JetBrains releases a version of Dokkatoo, continue to use this version and +[watch this space](https://github.com/Kotlin/dokka/issues/3131). -Be aware that many things are untested, broken, and undocumented. Please -[create an issue](https://github.com/adamko-dev/dokkatoo/issues) -if something is not as you'd expect, or like. ## Usage Dokkatoo is published on the [Gradle Plugin Portal](https://plugins.gradle.org/search?term=dokkatoo). + ### Quick start 1. Apply the appropriate plugin for any formats you'd like to generate. @@ -77,6 +82,7 @@ the [Gradle Plugin Portal](https://plugins.gradle.org/search?term=dokkatoo). 3. View the results in `./build/dokka/` + #### Configuring Dokkatoo Once the Dokkatoo plugin is applied to a project, it can be configuring using the `dokkatoo {}` DSL. @@ -128,6 +134,7 @@ dokkatoo { } ``` + #### Combining subprojects Dokkatoo can aggregate documentation from subprojects. @@ -169,6 +176,7 @@ Dokkatoo will then generate documentation into `./build/dokka/` To improve performance only run the task in the aggregating project by prefixing the task name with the subproject path (or `:` if aggregating in the root project). + ### Migrating from Dokka Gradle Plugin Dokkatoo is not a drop-in replacement for the Dokka Gradle Plugin, and requires migration. @@ -176,6 +184,7 @@ Dokkatoo is not a drop-in replacement for the Dokka Gradle Plugin, and requires When Dokkatoo matures, a guide will be made available. For now, check the [example projects](./examples#readme) for comparative examples. + ###### Apply both Dokka Gradle Plugin and Dokkatoo For help in migrating from the Dokka Gradle Plugin to Dokkatoo, you can still apply both plugins - @@ -197,7 +206,8 @@ dokkatoo { ### Snapshot releases -Snapshot versions of Dokkatoo are available on Maven Central. +Snapshot versions of Dokkatoo are available on +[Maven Central](https://s01.oss.sonatype.org/content/repositories/snapshots/dev/adamko/dokkatoo/dokkatoo-plugin/). ```kts // settings.gradle.kts @@ -207,7 +217,7 @@ pluginManagement { gradlePluginPortal() mavenCentral() - // add the Dokkatoo snapshot repository + // add Maven Central snapshot repository maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { name = "MavenCentralSnapshots" mavenContent { snapshotsOnly() } diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 855fe5d9..bc75168d 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -14,6 +14,10 @@ dependencyResolutionManagement { repositories { mavenCentral() + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { + name = "MavenCentralSnapshots" + mavenContent { snapshotsOnly() } + } gradlePluginPortal() } diff --git a/examples/custom-format-example/dokka/build.gradle.kts b/examples/custom-format-example/dokka/build.gradle.kts index 27540ee6..eb647a7e 100644 --- a/examples/custom-format-example/dokka/build.gradle.kts +++ b/examples/custom-format-example/dokka/build.gradle.kts @@ -1,15 +1,19 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.DokkaBaseConfiguration plugins { - kotlin("jvm") version "1.9.0" - id("org.jetbrains.dokka") version "1.9.0" + kotlin("jvm") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.10" } buildscript { dependencies { - classpath("org.jetbrains.dokka:dokka-base:1.9.0") + classpath("org.jetbrains.dokka:dokka-base:1.9.10") } } diff --git a/examples/custom-format-example/dokka/logo-styles.css b/examples/custom-format-example/dokka/logo-styles.css index ffe4d503..75b74d78 100644 --- a/examples/custom-format-example/dokka/logo-styles.css +++ b/examples/custom-format-example/dokka/logo-styles.css @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + /* * All Margins and sizes are custom for the ktor-logo.png file. * You may need to override it and find what works best for your case. @@ -17,4 +21,4 @@ .library-name--link::before { background-position: left; width: 52px; -} \ No newline at end of file +} diff --git a/examples/custom-format-example/dokka/settings.gradle.kts b/examples/custom-format-example/dokka/settings.gradle.kts index 9855e823..76a61a32 100644 --- a/examples/custom-format-example/dokka/settings.gradle.kts +++ b/examples/custom-format-example/dokka/settings.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + rootProject.name = "dokka-customFormat-example" diff --git a/examples/custom-format-example/dokkatoo/build.gradle.kts b/examples/custom-format-example/dokkatoo/build.gradle.kts index 69f88408..f7577f0e 100644 --- a/examples/custom-format-example/dokkatoo/build.gradle.kts +++ b/examples/custom-format-example/dokkatoo/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "1.9.10" id("dev.adamko.dokkatoo") version "2.1.0-SNAPSHOT" } diff --git a/examples/custom-format-example/dokkatoo/logo-styles.css b/examples/custom-format-example/dokkatoo/logo-styles.css index ffe4d503..75b74d78 100644 --- a/examples/custom-format-example/dokkatoo/logo-styles.css +++ b/examples/custom-format-example/dokkatoo/logo-styles.css @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + /* * All Margins and sizes are custom for the ktor-logo.png file. * You may need to override it and find what works best for your case. @@ -17,4 +21,4 @@ .library-name--link::before { background-position: left; width: 52px; -} \ No newline at end of file +} diff --git a/examples/gradle-example/dokka/build.gradle.kts b/examples/gradle-example/dokka/build.gradle.kts index 5f54ad9d..330e0104 100644 --- a/examples/gradle-example/dokka/build.gradle.kts +++ b/examples/gradle-example/dokka/build.gradle.kts @@ -1,9 +1,13 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTask import java.net.URL plugins { - kotlin("jvm") version "1.9.0" - id("org.jetbrains.dokka") version "1.9.0" + kotlin("jvm") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.10" } repositories { diff --git a/examples/gradle-example/dokka/settings.gradle.kts b/examples/gradle-example/dokka/settings.gradle.kts index 5b8c3c92..5a78a14b 100644 --- a/examples/gradle-example/dokka/settings.gradle.kts +++ b/examples/gradle-example/dokka/settings.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + rootProject.name = "dokka-gradle-example" diff --git a/examples/gradle-example/dokkatoo/build.gradle.kts b/examples/gradle-example/dokkatoo/build.gradle.kts index d7a83763..9f5cd038 100644 --- a/examples/gradle-example/dokkatoo/build.gradle.kts +++ b/examples/gradle-example/dokkatoo/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "1.9.10" id("dev.adamko.dokkatoo") version "2.1.0-SNAPSHOT" } diff --git a/examples/kotlin-as-java-example/dokka/build.gradle.kts b/examples/kotlin-as-java-example/dokka/build.gradle.kts index b339cec3..83673de7 100644 --- a/examples/kotlin-as-java-example/dokka/build.gradle.kts +++ b/examples/kotlin-as-java-example/dokka/build.gradle.kts @@ -1,6 +1,10 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { - kotlin("jvm") version "1.9.0" - id("org.jetbrains.dokka") version "1.9.0" + kotlin("jvm") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.10" } repositories { @@ -11,11 +15,11 @@ dependencies { testImplementation(kotlin("test-junit")) // Will apply the plugin to all Dokka tasks - dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.0") + dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10") // Will apply the plugin only to the `:dokkaHtml` task - //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.0") + //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10") // Will apply the plugin only to the `:dokkaGfm` task - //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.0") + //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10") } diff --git a/examples/kotlin-as-java-example/dokka/settings.gradle.kts b/examples/kotlin-as-java-example/dokka/settings.gradle.kts index 0a0b8c0e..6d4484a8 100644 --- a/examples/kotlin-as-java-example/dokka/settings.gradle.kts +++ b/examples/kotlin-as-java-example/dokka/settings.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + rootProject.name = "dokka-kotlinAsJava-example" diff --git a/examples/library-publishing-example/dokka/build.gradle.kts b/examples/library-publishing-example/dokka/build.gradle.kts index 731de85b..ac6678e3 100644 --- a/examples/library-publishing-example/dokka/build.gradle.kts +++ b/examples/library-publishing-example/dokka/build.gradle.kts @@ -1,6 +1,10 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { - kotlin("jvm") version "1.9.0" - id("org.jetbrains.dokka") version "1.9.0" + kotlin("jvm") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.10" `java-library` `maven-publish` } diff --git a/examples/library-publishing-example/dokka/settings.gradle.kts b/examples/library-publishing-example/dokka/settings.gradle.kts index e0847ac9..f0feed99 100644 --- a/examples/library-publishing-example/dokka/settings.gradle.kts +++ b/examples/library-publishing-example/dokka/settings.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + rootProject.name = "dokka-library-publishing-example" diff --git a/examples/multimodule-example/dokka/build.gradle.kts b/examples/multimodule-example/dokka/build.gradle.kts index 6b416abc..05a608cd 100644 --- a/examples/multimodule-example/dokka/build.gradle.kts +++ b/examples/multimodule-example/dokka/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + subprojects { repositories { mavenCentral() diff --git a/examples/multimodule-example/dokka/parentProject/build.gradle.kts b/examples/multimodule-example/dokka/parentProject/build.gradle.kts index 3563ecca..d4375abf 100644 --- a/examples/multimodule-example/dokka/parentProject/build.gradle.kts +++ b/examples/multimodule-example/dokka/parentProject/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.DokkaConfiguration.Visibility import org.jetbrains.dokka.gradle.DokkaTaskPartial import java.net.URL diff --git a/examples/multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts b/examples/multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts index 7b3b1e23..861317c1 100644 --- a/examples/multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts +++ b/examples/multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTaskPartial plugins { diff --git a/examples/multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts b/examples/multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts index e8b40d4a..d900cb6b 100644 --- a/examples/multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts +++ b/examples/multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTaskPartial plugins { diff --git a/examples/multimodule-example/dokka/settings.gradle.kts b/examples/multimodule-example/dokka/settings.gradle.kts index 9844b3cc..dd20f3dd 100644 --- a/examples/multimodule-example/dokka/settings.gradle.kts +++ b/examples/multimodule-example/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + pluginManagement { val kotlinVersion: String by settings val dokkaVersion: String by settings diff --git a/examples/multimodule-example/dokkatoo/buildSrc/build.gradle.kts b/examples/multimodule-example/dokkatoo/buildSrc/build.gradle.kts index f0054e1b..4389c5bf 100644 --- a/examples/multimodule-example/dokkatoo/buildSrc/build.gradle.kts +++ b/examples/multimodule-example/dokkatoo/buildSrc/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10") implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.1.0-SNAPSHOT") } diff --git a/examples/multiplatform-example/dokka/build.gradle.kts b/examples/multiplatform-example/dokka/build.gradle.kts index 7c5f11cf..df4ea014 100644 --- a/examples/multiplatform-example/dokka/build.gradle.kts +++ b/examples/multiplatform-example/dokka/build.gradle.kts @@ -1,11 +1,15 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("UNUSED_VARIABLE") import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.Platform plugins { - kotlin("multiplatform") version "1.9.0" - id("org.jetbrains.dokka") version "1.9.0" + kotlin("multiplatform") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.10" } repositories { diff --git a/examples/multiplatform-example/dokka/settings.gradle.kts b/examples/multiplatform-example/dokka/settings.gradle.kts index e9daf094..84beb2b1 100644 --- a/examples/multiplatform-example/dokka/settings.gradle.kts +++ b/examples/multiplatform-example/dokka/settings.gradle.kts @@ -1,2 +1,6 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + rootProject.name = "dokka-multiplatform-example" diff --git a/examples/multiplatform-example/dokkatoo/build.gradle.kts b/examples/multiplatform-example/dokkatoo/build.gradle.kts index 4b735906..1193c509 100644 --- a/examples/multiplatform-example/dokkatoo/build.gradle.kts +++ b/examples/multiplatform-example/dokkatoo/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.9.0" + kotlin("multiplatform") version "1.9.10" id("dev.adamko.dokkatoo") version "2.1.0-SNAPSHOT" } diff --git a/examples/versioning-multimodule-example/dokka/build.gradle.kts b/examples/versioning-multimodule-example/dokka/build.gradle.kts index 14aea2b4..88a78e37 100644 --- a/examples/versioning-multimodule-example/dokka/build.gradle.kts +++ b/examples/versioning-multimodule-example/dokka/build.gradle.kts @@ -1,6 +1,10 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { - kotlin("jvm") version "1.9.0" - id("org.jetbrains.dokka") version "1.9.0" apply false + kotlin("jvm") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.10" apply false } // The versioning plugin must be applied in all submodules @@ -14,6 +18,6 @@ subprojects { } val dokkaPlugin by configurations dependencies { - dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.9.0") + dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.9.10") } } diff --git a/examples/versioning-multimodule-example/dokka/parentProject/build.gradle.kts b/examples/versioning-multimodule-example/dokka/parentProject/build.gradle.kts index 6d830079..9fc84cba 100644 --- a/examples/versioning-multimodule-example/dokka/parentProject/build.gradle.kts +++ b/examples/versioning-multimodule-example/dokka/parentProject/build.gradle.kts @@ -1,10 +1,14 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaMultiModuleTask import org.jetbrains.dokka.versioning.VersioningPlugin import org.jetbrains.dokka.versioning.VersioningConfiguration buildscript { dependencies { - classpath("org.jetbrains.dokka:versioning-plugin:1.9.0") + classpath("org.jetbrains.dokka:versioning-plugin:1.9.10") } repositories { diff --git a/examples/versioning-multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts b/examples/versioning-multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts index bf1513f8..991e6c4b 100644 --- a/examples/versioning-multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts +++ b/examples/versioning-multimodule-example/dokka/parentProject/childProjectA/build.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + // intentionally empty - build config is set in the root build.gradle.kts diff --git a/examples/versioning-multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts b/examples/versioning-multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts index bf1513f8..991e6c4b 100644 --- a/examples/versioning-multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts +++ b/examples/versioning-multimodule-example/dokka/parentProject/childProjectB/build.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + // intentionally empty - build config is set in the root build.gradle.kts diff --git a/examples/versioning-multimodule-example/dokka/settings.gradle.kts b/examples/versioning-multimodule-example/dokka/settings.gradle.kts index ec6614f0..0644117f 100644 --- a/examples/versioning-multimodule-example/dokka/settings.gradle.kts +++ b/examples/versioning-multimodule-example/dokka/settings.gradle.kts @@ -1,5 +1,9 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + include(":parentProject") include(":parentProject:childProjectA") include(":parentProject:childProjectB") -rootProject.name = "dokka-versioning-multimodule-example" \ No newline at end of file +rootProject.name = "dokka-versioning-multimodule-example" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 26ea9824..51f0ddc5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] kotlin = "1.9.0" # should match Gradle's embedded Kotlin version https://docs.gradle.org/current/userguide/compatibility.html#kotlin -kotlin-dokka = "1.9.0" -kotlinx-serialization = "1.6.0" +kotlin-dokka = "1.9.10" +kotlinx-serialization = "1.6.2" ktor = "2.3.6" -kotest = "5.6.2" +kotest = "5.8.0" gradlePlugin-android = "8.0.2" -gradlePlugin-dokkatoo = "1.6.0" +gradlePlugin-dokkatoo = "2.1.0-SNAPSHOT" gradlePlugin-gradlePublishPlugin = "1.2.1" gradlePlugin-bcvMu = "0.0.4" diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/build.gradle.kts index 860666eb..68058f5d 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { id("com.android.library") id("org.jetbrains.dokka") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/settings.gradle.kts index 74641446..0b7f6c91 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") apply(from = "./template.settings.gradle.kts") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/src/main/AndroidManifest.xml b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/src/main/AndroidManifest.xml index a35f86be..43894029 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/src/main/AndroidManifest.xml +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/src/main/AndroidManifest.xml @@ -1 +1,5 @@ + + diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-android-0/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/gradle.properties index 1181ddfb..1e2686ef 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/gradle.properties @@ -1 +1,5 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/settings.gradle.kts index 87cf173c..75e16903 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") apply(from = "./template.settings.gradle.kts") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic-groovy/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/build.gradle.kts index e81e35fd..7b1d7813 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.gradle.kotlinSourceSet import org.jetbrains.dokka.base.DokkaBase @@ -12,11 +16,11 @@ plugins { buildscript { dependencies { - classpath("org.jetbrains.dokka:dokka-base:1.9.0") + classpath("org.jetbrains.dokka:dokka-base:1.9.10") } } -version = "1.9.0-SNAPSHOT" +version = "1.9.10-SNAPSHOT" apply(from = "./template.root.gradle.kts") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-resource.svg b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-resource.svg index 1865f739..c4b95383 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-resource.svg +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-resource.svg @@ -1,3 +1,7 @@ + + - \ No newline at end of file + diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-style-to-add.css b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-style-to-add.css index 408c210e..f949ca1c 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-style-to-add.css +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/custom-style-to-add.css @@ -1 +1,5 @@ -/* custom stylesheet */ \ No newline at end of file +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + +/* custom stylesheet */ diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/logo-styles.css b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/logo-styles.css index 2ac57218..c7932753 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/logo-styles.css +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/customResources/logo-styles.css @@ -1,3 +1,7 @@ -#logo { - background-image: url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg'); -} \ No newline at end of file +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + +:root { + --dokka-logo-image-url: url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg'); +} diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/gradle.properties index 1181ddfb..1e2686ef 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/gradle.properties @@ -1 +1,5 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/settings.gradle.kts index d563ebcf..ac3e1328 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") apply(from = "./template.settings.gradle.kts") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/build.gradle.kts index a75f62df..c07cc49b 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/build.gradle.kts @@ -2,11 +2,11 @@ import dev.adamko.dokkatoo.dokka.parameters.VisibilityModifier import dev.adamko.dokkatoo.dokka.plugins.DokkaHtmlPluginParameters plugins { - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "1.9.10" id("dev.adamko.dokkatoo") version "2.1.0-SNAPSHOT" } -version = "1.9.0-SNAPSHOT" +version = "1.9.10-SNAPSHOT" dependencies { testImplementation(kotlin("test-junit")) diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-resource.svg b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-resource.svg index 1865f739..c4b95383 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-resource.svg +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-resource.svg @@ -1,3 +1,7 @@ + + - \ No newline at end of file + diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-style-to-add.css b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-style-to-add.css index 408c210e..f949ca1c 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-style-to-add.css +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/custom-style-to-add.css @@ -1 +1,5 @@ -/* custom stylesheet */ \ No newline at end of file +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + +/* custom stylesheet */ diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/logo-styles.css b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/logo-styles.css index 2ac57218..c7932753 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/logo-styles.css +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-basic/dokkatoo/customResources/logo-styles.css @@ -1,3 +1,7 @@ -#logo { - background-image: url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg'); -} \ No newline at end of file +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + +:root { + --dokka-logo-image-url: url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg'); +} diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/build.gradle.kts index 062f1eb7..ad888b74 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/build.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + apply(from = "./template.root.gradle.kts") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/gradle.properties index 1181ddfb..1e2686ef 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/gradle.properties @@ -1 +1,5 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/build.gradle.kts index ab86c333..1e61f8b2 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { // TODO: File bug report for gradle: :moduleA:moduleB:dokkaHtml is missing kotlin gradle plugin from // the runtime classpath during execution without this plugin in the parent project diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleB/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleB/build.gradle.kts index 9f7e98de..aa562cde 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleB/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleB/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { kotlin("jvm") id("org.jetbrains.dokka") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleC/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleC/build.gradle.kts index 9f7e98de..aa562cde 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleC/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/moduleA/moduleC/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { kotlin("jvm") id("org.jetbrains.dokka") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/settings.gradle.kts index a1b4baa6..e10418db 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + apply(from = "./template.settings.gradle.kts") rootProject.name = "it-multimodule-0" include(":moduleA") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-collector-0/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/build.gradle.kts index fc353172..0bd02d72 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { id("org.jetbrains.dokka") kotlin("js") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/gradle.properties index 5a732839..63c36fae 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/gradle.properties @@ -1,2 +1,6 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 react_version=18.2.0-pre.467 diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/settings.gradle.kts index 431c0715..2f77c8a0 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") apply(from = "./template.settings.gradle.kts") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-js-ir-0/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/build.gradle.kts index 062f1eb7..ad888b74 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/build.gradle.kts @@ -1 +1,5 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + apply(from = "./template.root.gradle.kts") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/gradle.properties index 1181ddfb..1e2686ef 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/gradle.properties @@ -1 +1,5 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/build.gradle.kts index ab86c333..1e61f8b2 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + plugins { // TODO: File bug report for gradle: :moduleA:moduleB:dokkaHtml is missing kotlin gradle plugin from // the runtime classpath during execution without this plugin in the parent project diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleB/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleB/build.gradle.kts index 1981701f..91ccea29 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleB/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleB/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTask plugins { diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleC/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleC/build.gradle.kts index 728e764d..6a77c9ed 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleC/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleC/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTask plugins { diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleD/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleD/build.gradle.kts index e5edf940..1598ecef 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleD/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/moduleA/moduleD/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTask plugins { diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/settings.gradle.kts index 20cde260..1039945d 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + apply(from = "./template.settings.gradle.kts") rootProject.name = "it-multimodule-0" include(":moduleA") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-0/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/gradle.properties index 1181ddfb..1e2686ef 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/gradle.properties @@ -1 +1,5 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/settings.gradle.kts index 753b6ec2..fa94d950 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + apply(from = "./template.settings.gradle.kts") rootProject.name = "it-multimodule-1" include(":first") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-1/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/gradle.properties index bd42059c..504f59b0 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/gradle.properties @@ -1,2 +1,6 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/settings.gradle.kts index da027565..50595c87 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + apply(from = "./template.settings.gradle.kts") rootProject.name = "it-multimodule-versioning-0" include(":first") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multimodule-versioning-0/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/build.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/build.gradle.kts index d7d47bd5..b22d62ee 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/build.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dokka.gradle.DokkaTask import java.net.URL diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/gradle.properties b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/gradle.properties index 686edd2a..4d8f2847 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/gradle.properties +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/gradle.properties @@ -1,4 +1,8 @@ -dokka_it_kotlin_version=1.9.0 +# +# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + +dokka_it_kotlin_version=1.9.10 #these flags are enabled by default since 1.6.20. #remove when this test is executed with Kotlin >= 1.6.20 kotlin.mpp.enableGranularSourceSetsMetadata=true diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/settings.gradle.kts index 1d4f1681..47ea1616 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/settings.gradle.kts @@ -1,2 +1,6 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + apply(from = "./template.settings.gradle.kts") rootProject.name = "it-multiplatform-0" diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.root.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.root.gradle.kts index f63c28e7..a7fc4bf8 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.root.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.root.gradle.kts @@ -1,11 +1,12 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + allprojects { repositories { - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenLocal() mavenCentral() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") diff --git a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.settings.gradle.kts b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.settings.gradle.kts index b7e3195e..7f40284f 100644 --- a/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.settings.gradle.kts +++ b/modules/dokkatoo-plugin-integration-tests/projects/it-multiplatform-0/dokka/template.settings.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + @file:Suppress("LocalVariableName", "UnstableApiUsage") pluginManagement { @@ -14,7 +18,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "org.jetbrains.dokka") { - useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0") + useModule("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } if (requested.id.id == "com.android.library") { @@ -28,11 +32,8 @@ pluginManagement { } repositories { mavenLocal() - maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") mavenCentral() gradlePluginPortal() google() - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap") - maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev") } }