Skip to content

Commit 515251e

Browse files
authored
Merge pull request #4912 from JetBrains/fix-node
add KGP 2.2.0
2 parents 3542d14 + bd0d510 commit 515251e

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

.teamcity/BuildParams.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,13 @@ object BuildParams {
3131
const val CORE_API_BUILD_ID = "Kotlin_KotlinRelease_220_LibraryReferenceLatestDocs"
3232
const val CORE_API_TITLE = "Core API"
3333

34-
const val KGP_RELEASE_TAG = KOTLIN_RELEASE_TAG
35-
const val KGP_RELEASE_LABEL = KOTLIN_RELEASE_LABEL
36-
const val KGP_ID = "kotlin-gradle-plugin"
37-
const val KGP_TITLE = "Kotlin Gradle Plugin"
38-
3934
const val KOTLINX_METADATA_ID = "kotlinx-metadata-jvm"
4035
const val KOTLINX_METADATA_RELEASE_TAG = KOTLIN_RELEASE_TAG
4136
const val KOTLINX_METADATA_TITLE = KOTLINX_METADATA_ID
4237

4338
val KGP_REFERENCE = KotlinGradleAPI {
4439
addVersion("2.1.20", VCS.branch("whyoleg/dokka2-sync"))
45-
// addVersion("2.2.0", VCS.branch("2.2.0"))
40+
addVersion("2.2.0", VCS.branch("2.2.0"))
4641
}
4742

4843
val API_COMPOSE = ComposeMultiplatformCore {

.teamcity/common/extensions/references.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fun BuildTypeSettings.configureReferenceTemplate() {
157157
scriptContent = """
158158
yarn install --frozen-lockfile
159159
""".trimIndent()
160-
dockerImage = "node:16-alpine"
160+
dockerImage = "node:18-alpine"
161161
}
162162
script {
163163
id = "step-build-templates"
@@ -166,7 +166,7 @@ fun BuildTypeSettings.configureReferenceTemplate() {
166166
scriptContent = """
167167
node ./scripts/dokka/generate-templates.js
168168
""".trimIndent()
169-
dockerImage = "node:16-alpine"
169+
dockerImage = "node:18-alpine"
170170
}
171171
}
172172
}

.teamcity/references/builds/kgp/KotlinGradleAPI.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package references.builds.kgp
22

3-
import BuildParams.KGP_TITLE
43
import common.ReferenceProject
54
import common.extensions.apiReference
65
import common.extensions.dokkaBuildHtml
76

7+
const val KGP_TITLE = "Kotlin Gradle Plugin"
8+
89
class KotlinGradleAPI(init: KotlinGradleAPI.() -> Unit) : ReferenceProject("kotlin-gradle-plugin", KGP_TITLE) {
910
init {
1011
init()

.teamcity/references/templates/PrepareDokkaTemplate.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ fun BuildTypeSettings.configureReferenceTemplate() {
2626
scriptContent = """
2727
yarn install --frozen-lockfile
2828
""".trimIndent()
29-
dockerImage = "node:16-alpine"
29+
dockerImage = "node:18-alpine"
3030
}
3131
script {
3232
name = "Build Templates"
3333
scriptContent = """
3434
node ./scripts/dokka/generate-templates.js
3535
""".trimIndent()
36-
dockerImage = "node:16-alpine"
36+
dockerImage = "node:18-alpine"
3737
}
3838
}
3939
}

.teamcity/tests/buildTypes/ApiReferencesTemplateTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object ApiReferencesTemplateTest: BuildType({
2222
yarn install --frozen-lockfile
2323
yarn build:production
2424
""".trimIndent()
25-
dockerImage = "node:16-alpine"
25+
dockerImage = "node:18-alpine"
2626
}
2727
script {
2828
scriptContent = "./scripts/dokka/up.sh"

0 commit comments

Comments
 (0)