Skip to content

Commit 550e1be

Browse files
Merge branch 'master' into packages-and-imports
2 parents bf0ada4 + 0ded128 commit 550e1be

107 files changed

Lines changed: 3569 additions & 1189 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/skills/add-api-reference/SKILL.md

Lines changed: 466 additions & 0 deletions
Large diffs are not rendered by default.

.teamcity/BuildParams.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ object BuildParams {
2828
const val KOTLINX_IO_ID = "kotlinx-io"
2929
const val KOTLINX_IO_TITLE = KOTLINX_IO_ID
3030

31+
const val KOTLINX_COLLECTIONS_IMMUTABLE_RELEASE_TAG = "v0.5.1"
32+
const val KOTLINX_COLLECTIONS_IMMUTABLE_RELEASE_LABEL = "0.5.1"
33+
const val KOTLINX_COLLECTIONS_IMMUTABLE_ID = "kotlinx.collections.immutable"
34+
const val KOTLINX_COLLECTIONS_IMMUTABLE_TITLE = KOTLINX_COLLECTIONS_IMMUTABLE_ID
35+
3136
const val KOTLIN_RELEASE_TAG = "2.4.0"
3237
const val KOTLIN_RELEASE_LABEL = KOTLIN_RELEASE_TAG
3338

@@ -63,6 +68,7 @@ object BuildParams {
6368
"api/$KOTLINX_DATETIME_ID",
6469
"api/$KOTLINX_IO_ID",
6570
"api/$KOTLINX_METADATA_ID",
71+
"api/$KOTLINX_COLLECTIONS_IMMUTABLE_ID",
6672
"api/${KGP_REFERENCE.urlPart}",
6773
"api/${API_COMPOSE.urlPart}",
6874
)

.teamcity/references/BuildApiReferencesProject.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ package references
33
import BuildParams.API_COMPOSE
44
import BuildParams.KGP_REFERENCE
55
import jetbrains.buildServer.configs.kotlin.Project
6+
import references.builds.kotlinx.collectionsImmutable.KotlinxCollectionsImmutableBuildApiReference
7+
import references.builds.kotlinx.collectionsImmutable.KotlinxCollectionsImmutableBuildSearchIndex
8+
import references.builds.kotlinx.collectionsImmutable.KotlinxCollectionsImmutablePrepareDokkaTemplates
69
import references.builds.kotlinx.coroutines.KotlinxCoroutinesBuildApiReference
710
import references.builds.kotlinx.coroutines.KotlinxCoroutinesBuildSearchIndex
811
import references.builds.kotlinx.coroutines.KotlinxCoroutinesPrepareDokkaTemplates
@@ -35,6 +38,10 @@ object BuildApiReferencesProject : Project({
3538
buildType(KotlinxIOBuildSearchIndex)
3639
buildType(KotlinxIOPrepareDokkaTemplates)
3740

41+
buildType(KotlinxCollectionsImmutableBuildApiReference)
42+
buildType(KotlinxCollectionsImmutableBuildSearchIndex)
43+
buildType(KotlinxCollectionsImmutablePrepareDokkaTemplates)
44+
3845
buildType(KotlinxSerializationBuildApiReference)
3946
buildType(KotlinxSerializationBuildSearchIndex)
4047
buildType(KotlinxSerializationPrepareDokkaTemplates)
@@ -54,6 +61,7 @@ object BuildApiReferencesProject : Project({
5461
vcsRoot(KotlinxCoroutines)
5562
vcsRoot(KotlinxDatetime)
5663
vcsRoot(KotlinxIO)
64+
vcsRoot(KotlinxCollectionsImmutable)
5765
vcsRoot(Kotlin)
5866

5967
template(PrepareDokkaTemplate)
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package references.builds.kotlinx.collectionsImmutable
2+
3+
import BuildParams.KOTLINX_COLLECTIONS_IMMUTABLE_ID
4+
import BuildParams.KOTLINX_COLLECTIONS_IMMUTABLE_RELEASE_LABEL
5+
import references.BuildApiPages
6+
import references.dependsOnDokkaTemplate
7+
import references.scriptBuildHtml
8+
import references.scriptDropSnapshot
9+
import references.vcsRoots.KotlinxCollectionsImmutable
10+
11+
private const val DOKKA_HTML_RESULT = "core/build/dokka/html"
12+
13+
object KotlinxCollectionsImmutableBuildApiReference : BuildApiPages(
14+
apiId = KOTLINX_COLLECTIONS_IMMUTABLE_ID,
15+
releaseTag = KOTLINX_COLLECTIONS_IMMUTABLE_RELEASE_LABEL,
16+
pagesRoot = DOKKA_HTML_RESULT,
17+
stepDropSnapshot = {
18+
scriptDropSnapshot {
19+
// language=bash
20+
scriptContent = """
21+
#!/bin/bash
22+
sed -i -E "s/versionSuffix=SNAPSHOT//gi" ./gradle.properties
23+
""".trimIndent()
24+
}
25+
},
26+
stepBuildHtml = {
27+
scriptBuildHtml { tasks = ":kotlinx-collections-immutable:dokkaGenerate" }
28+
},
29+
init = {
30+
vcs {
31+
root(KotlinxCollectionsImmutable)
32+
}
33+
dependencies {
34+
dependsOnDokkaTemplate(KotlinxCollectionsImmutablePrepareDokkaTemplates, "core/dokka-templates")
35+
}
36+
})
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package references.builds.kotlinx.collectionsImmutable
2+
3+
import BuildParams.KOTLINX_COLLECTIONS_IMMUTABLE_ID
4+
import templates.TemplateSearchIndex
5+
6+
object KotlinxCollectionsImmutableBuildSearchIndex : TemplateSearchIndex({
7+
name = "$KOTLINX_COLLECTIONS_IMMUTABLE_ID search"
8+
description = "Build search index for Kotlinx Collections Immutable"
9+
10+
params {
11+
param("env.ALGOLIA_INDEX_NAME", "$KOTLINX_COLLECTIONS_IMMUTABLE_ID")
12+
}
13+
14+
dependencies {
15+
dependency(KotlinxCollectionsImmutableBuildApiReference) {
16+
snapshot {}
17+
artifacts {
18+
artifactRules = """
19+
pages.zip!** => dist/api/$KOTLINX_COLLECTIONS_IMMUTABLE_ID/
20+
""".trimIndent()
21+
cleanDestination = true
22+
}
23+
}
24+
}
25+
})
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package references.builds.kotlinx.collectionsImmutable
2+
3+
import BuildParams.KOTLINX_COLLECTIONS_IMMUTABLE_ID
4+
import BuildParams.KOTLINX_COLLECTIONS_IMMUTABLE_TITLE
5+
import jetbrains.buildServer.configs.kotlin.BuildType
6+
import references.templates.PrepareDokkaTemplate
7+
8+
object KotlinxCollectionsImmutablePrepareDokkaTemplates : BuildType({
9+
name = "$KOTLINX_COLLECTIONS_IMMUTABLE_ID templates"
10+
description = "Build dokka templates for Kotlinx Collections Immutable"
11+
12+
templates(PrepareDokkaTemplate)
13+
14+
params {
15+
param("env.ALGOLIA_INDEX_NAME", KOTLINX_COLLECTIONS_IMMUTABLE_ID)
16+
param("env.API_REFERENCE_NAME", KOTLINX_COLLECTIONS_IMMUTABLE_TITLE)
17+
}
18+
})
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package references.vcsRoots
2+
3+
import BuildParams.KOTLINX_COLLECTIONS_IMMUTABLE_RELEASE_TAG
4+
import common.extensions.VCS
5+
import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
6+
7+
object KotlinxCollectionsImmutable : GitVcsRoot({
8+
name = "kotlinx.collections.immutable vcs root"
9+
url = "git@github.com:Kotlin/kotlinx.collections.immutable.git"
10+
branch = VCS.tag(KOTLINX_COLLECTIONS_IMMUTABLE_RELEASE_TAG)
11+
branchSpec = "+:refs/tags/*"
12+
useTagsAsBranches = true
13+
authMethod = uploadedKey {
14+
uploadedKey = "teamcity"
15+
}
16+
})

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This repository is the source for [https://kotlinlang.org](https://kotlinlang.or
1818
|-----------------------------------------------------------|----------------------------------------------------------|
1919
| [Main page](https://kotlinlang.org/) | [templates/pages/index.html](templates/pages/index.html) |
2020
| [Kotlin docs](https://kotlinlang.org/docs/home.html) | [docs/topics](docs/topics) |
21-
| [Server-side](https://kotlinlang.org/server-side/) | [pages/server-side](pages/server-side) |
21+
| [Backend](https://kotlinlang.org/backend/) | [pages/backend](pages/backend) |
2222
| [Multiplatform](https://kotlinlang.org/multiplatform/) | [pages/multiplatform](pages/multiplatform) |
2323
| [Case Studies](https://kotlinlang.org/case-studies/) | [pages/case-studies](pages/case-studies) |
2424
| [Community](https://kotlinlang.org/community/) | [pages/community](pages/community) |
@@ -100,7 +100,7 @@ Once you publish a pull request, the changes will be validated by [GitHub Action
100100
To add a case study, do the following:
101101
1. Fill the case study info in the [case-studies.yml](/data/case-studies/case-studies.yml) with the next:
102102
- `id`, a unique identifier for the case study.
103-
- `type`, the case study category: either `multiplatform` or `server-side`.
103+
- `type`, the case study category: either `multiplatform` or `backend`.
104104
- `description`, a markdown-enabled text description of the case study (supports # header **bold** and [links](https://example.com), paragraphs are made with two new lines).
105105
- `logo` (optional), an array of 0-2 image paths relative to the `/public/` directory.
106106
- `signature` (optional), an object with `name` and `position` fields for the quote author.
50.8 KB
Loading

blocks/benchmark/constants.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export const KOTLIN_BENCHMARK_TITLE = 'Kotlin Benchmark' as const;
2+
export const KOTLIN_BENCHMARK_URL = '/benchmark/' as const;
3+
export const METHODOLOGY_URL = '/benchmark/methodology/' as const;

0 commit comments

Comments
 (0)