Skip to content

Commit 16356bd

Browse files
committed
Merge branch 'master' into develop
2 parents e482ec9 + 8b421cd commit 16356bd

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-dokka.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tasks.withType<AbstractDokkaTask>().configureEach {
1616
mapOf(
1717
"org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${
1818
rootDir.resolve("dokka-templates")
19-
}"""
19+
}" }"""
2020
)
2121
)
2222
}

docs/ReleaseChecklist.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ The following steps are usually performed:
2222
- Add a note describing what will be released to the [CHANGELOG](../CHANGELOG.md);
2323
- Bump up the current version in [gradle.properties](../gradle.properties);
2424
- Commit changes in `README`, `CHANGELOG` and `gradle.properties` into the `develop` branch;
25-
- Checkout `gh-pages` branch, generate documentation using Dokka (`./gradlew dokkaHtmlMultiModule`), move it to `docs` directory, and commit it all;
26-
- that generated docs use correct `kotlinx-io` version;
2725
- [Deploy](https://teamcity.jetbrains.com/buildConfiguration/KotlinTools_KotlinxIo_DeployRunThisOne)
2826
a pre-release version of the library into [Sonatype](http://oss.sonatype.org) staging repository,
2927
close it and [run smoke tests](https://teamcity.jetbrains.com/buildConfiguration/KotlinTools_KotlinxIo_DeploymentSmokeTest)
@@ -35,7 +33,7 @@ with this pre-release version;
3533
necessary;
3634
- release names are usually starts with `v`, like `v0.9.10`, but there's no `v` in a git tag, like `0.9.10`.
3735
- Deploy the release version, close the repo, run smoke tests with it and if tests passed, release the repository.
38-
- Push `gh-pages` branch;
36+
- Update version in `KOTLINX_IO_RELEASE_TAG` for [JetBrains/kotlin-web-site](https://github.com/JetBrains/kotlin-web-site/blob/master/.teamcity/BuildParams.kt#L7)
3937
- Set previously created draft in [kotlinx-io/releases](https://github.com/Kotlin/kotlinx-io/releases)
4038
as the latest version;
4139
- That's all, folks!

0 commit comments

Comments
 (0)