Skip to content

Commit 0389c35

Browse files
committed
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
1 parent d57f335 commit 0389c35

File tree

7 files changed

+50
-60
lines changed

7 files changed

+50
-60
lines changed

libraries/tools/kotlin-stdlib-docs/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ val prepare by tasks.registering {
5050
dependsOn(":kotlin_big:extractLibs")
5151
}
5252

53-
repositories {
54-
mavenCentral()
55-
maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
56-
}
57-
5853
dependencies {
5954
dokkaPlugin(project(":plugins:dokka-samples-transformer-plugin"))
6055
dokkaPlugin(project(":plugins:dokka-stdlib-configuration-plugin"))
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugins {
2+
id("org.jetbrains.kotlin.jvm") version "1.8.0" apply false
3+
}
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
plugins {
2-
id 'org.jetbrains.kotlin.jvm' version '1.8.0'
2+
id 'org.jetbrains.kotlin.jvm'
33
}
44
description "Dokka Plugin to transform the samples from stdlib"
55

6-
repositories {
7-
mavenCentral()
8-
maven {
9-
url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev'
10-
}
11-
mavenLocal()
12-
}
13-
14-
final String dokka_version = findProperty("dokka_version")
6+
final String dokka_version = property("dokka_version")
157

168
dependencies {
179
implementation "org.jetbrains.dokka:dokka-base:$dokka_version"
1810
compileOnly "org.jetbrains.dokka:dokka-core:$dokka_version"
1911
compileOnly "org.jetbrains.dokka:dokka-analysis:$dokka_version"
2012
}
2113

22-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
23-
kotlinOptions.jvmTarget = "1.8"
14+
kotlin {
15+
jvmToolchain(8)
2416
}
2517

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
plugins {
2-
id 'org.jetbrains.kotlin.jvm' version '1.8.0'
2+
id 'org.jetbrains.kotlin.jvm'
33
}
44
description "Dokka Plugin to configure Dokka for stdlib"
55

6-
repositories {
7-
mavenCentral()
8-
maven {
9-
url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev'
10-
}
11-
mavenLocal()
12-
}
13-
14-
final String dokka_version = findProperty("dokka_version")
6+
final String dokka_version = property("dokka_version")
157

168
dependencies {
179
implementation "org.jetbrains.dokka:dokka-base:$dokka_version"
1810
compileOnly "org.jetbrains.dokka:dokka-core:$dokka_version"
1911
compileOnly "org.jetbrains.dokka:dokka-analysis:$dokka_version"
2012
}
2113

22-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
23-
kotlinOptions.jvmTarget = "1.8"
14+
kotlin {
15+
jvmToolchain(8)
2416
}
2517

libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
11
plugins {
2-
id 'org.jetbrains.kotlin.jvm' version '1.8.0'
2+
id 'org.jetbrains.kotlin.jvm'
33
}
44
description "Dokka Plugin to filter version for stdlib"
55

6-
repositories {
7-
mavenCentral()
8-
maven {
9-
url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev'
10-
}
11-
mavenLocal()
12-
}
13-
14-
final String dokka_version = findProperty("dokka_version")
6+
final String dokka_version = property("dokka_version")
157

168
dependencies {
179
implementation "org.jetbrains.dokka:dokka-base:$dokka_version"
1810
compileOnly "org.jetbrains.dokka:dokka-core:$dokka_version"
1911
compileOnly "org.jetbrains.dokka:dokka-analysis:$dokka_version"
2012
testImplementation 'org.jetbrains.kotlin:kotlin-test'}
2113

22-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
23-
kotlinOptions.jvmTarget = "1.8"
14+
kotlin {
15+
jvmToolchain(8)
2416
}
2517
test {
2618
useJUnitPlatform()

libraries/tools/kotlin-stdlib-docs/settings.gradle

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
pluginManagement {
2+
val dokkaVersion = providers.gradleProperty("dokka_version").get()
3+
val dokkaRepository = providers.gradleProperty("dokka_repository").getOrElse("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
4+
plugins {
5+
id("org.jetbrains.dokka") version(dokkaVersion)
6+
}
7+
8+
repositories {
9+
gradlePluginPortal()
10+
maven(url = dokkaRepository)
11+
if ("-local" in dokkaVersion) {
12+
mavenLocal()
13+
}
14+
}
15+
}
16+
dependencyResolutionManagement {
17+
repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
18+
val dokkaVersion = providers.gradleProperty("dokka_version").get()
19+
val dokkaRepository = providers.gradleProperty("dokka_repository").getOrElse("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
20+
repositories {
21+
mavenCentral()
22+
maven(url = dokkaRepository)
23+
if ("-local" in dokkaVersion) {
24+
mavenLocal()
25+
}
26+
}
27+
}
28+
29+
rootProject.name = "kotlin-stdlib-docs"
30+
31+
include("kotlin_big")
32+
include("plugins")
33+
include("plugins:dokka-samples-transformer-plugin")
34+
include("plugins:dokka-stdlib-configuration-plugin")
35+
include("plugins:dokka-version-filter-plugin")

0 commit comments

Comments
 (0)