Merge branch 'master' into add-kug-jaipur

Author: SUMAN1040

.teamcity/BuildParams.kt

@@ -15,8 +15,8 @@ object BuildParams {
   const val KOTLINX_SERIALIZATION_ID = "kotlinx.serialization"
   const val KOTLINX_SERIALIZATION_TITLE = KOTLINX_SERIALIZATION_ID
 
-  const val KOTLINX_DATETIME_RELEASE_TAG = "whyoleg/dokka2-sync"
-  const val KOTLINX_DATETIME_RELEASE_LABEL = "v0.6.2"
+  const val KOTLINX_DATETIME_RELEASE_TAG = "latest-release"
+  const val KOTLINX_DATETIME_RELEASE_LABEL = "v0.7.0"
   const val KOTLINX_DATETIME_ID = "kotlinx-datetime"
   const val KOTLINX_DATETIME_TITLE = KOTLINX_DATETIME_ID
 
@@ -31,18 +31,13 @@ object BuildParams {
   const val CORE_API_BUILD_ID = "Kotlin_KotlinRelease_220_LibraryReferenceLatestDocs"
   const val CORE_API_TITLE = "Core API"
 
-  const val KGP_RELEASE_TAG = KOTLIN_RELEASE_TAG
-  const val KGP_RELEASE_LABEL = KOTLIN_RELEASE_LABEL
-  const val KGP_ID = "kotlin-gradle-plugin"
-  const val KGP_TITLE = "Kotlin Gradle Plugin"
-
   const val KOTLINX_METADATA_ID = "kotlinx-metadata-jvm"
   const val KOTLINX_METADATA_RELEASE_TAG = KOTLIN_RELEASE_TAG
   const val KOTLINX_METADATA_TITLE = KOTLINX_METADATA_ID
 
   val KGP_REFERENCE = KotlinGradleAPI {
     addVersion("2.1.20", VCS.branch("whyoleg/dokka2-sync"))
-//    addVersion("2.2.0", VCS.branch("2.2.0"))
+    addVersion("2.2.0", VCS.branch("2.2.0"))
   }
 
   val API_COMPOSE = ComposeMultiplatformCore {

.teamcity/common/extensions/references.kt

@@ -157,7 +157,7 @@ fun BuildTypeSettings.configureReferenceTemplate() {
             scriptContent = """
                 yarn install --frozen-lockfile
             """.trimIndent()
-            dockerImage = "node:16-alpine"
+            dockerImage = "node:18-alpine"
         }
         script {
             id = "step-build-templates"
@@ -166,7 +166,7 @@ fun BuildTypeSettings.configureReferenceTemplate() {
             scriptContent = """
                 node ./scripts/dokka/generate-templates.js
             """.trimIndent()
-            dockerImage = "node:16-alpine"
+            dockerImage = "node:18-alpine"
         }
     }
 }

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

@@ -1,10 +1,11 @@
 package references.builds.kgp
 
-import BuildParams.KGP_TITLE
 import common.ReferenceProject
 import common.extensions.apiReference
 import common.extensions.dokkaBuildHtml
 
+private const val KGP_TITLE = "Kotlin Gradle Plugin"
+
 class KotlinGradleAPI(init: KotlinGradleAPI.() -> Unit) : ReferenceProject("kotlin-gradle-plugin", KGP_TITLE) {
     init {
         init()

.teamcity/references/builds/kotlinx/datetime/KotlinxDatetimeBuildApiReference.kt

@@ -24,7 +24,7 @@ object KotlinxDatetimeBuildApiReference : BuildApiPages(
         }
     },
     stepBuildHtml = {
-        scriptBuildHtml { tasks = ":kotlinx-datetime:dokkaHtml" }
+        scriptBuildHtml { tasks = ":kotlinx-datetime:dokkaGenerate" }
     },
     init = {
         vcs {

.teamcity/references/templates/PrepareDokkaTemplate.kt

@@ -26,14 +26,14 @@ fun BuildTypeSettings.configureReferenceTemplate() {
       scriptContent = """
         yarn install --frozen-lockfile
       """.trimIndent()
-      dockerImage = "node:16-alpine"
+      dockerImage = "node:18-alpine"
     }
     script {
       name = "Build Templates"
       scriptContent = """
         node ./scripts/dokka/generate-templates.js
       """.trimIndent()
-      dockerImage = "node:16-alpine"
+      dockerImage = "node:18-alpine"
     }
   }
 }

.teamcity/tests/buildTypes/ApiReferencesTemplateTest.kt

@@ -22,7 +22,7 @@ object ApiReferencesTemplateTest: BuildType({
         yarn install --frozen-lockfile
         yarn build:production
       """.trimIndent()
-      dockerImage = "node:16-alpine"
+      dockerImage = "node:18-alpine"
     }
     script {
       scriptContent = "./scripts/dokka/up.sh"

assets/kotlin-reference.pdf

@@ -1,4 +1,3 @@
-import org.junit.Test                   // Tests
 import kotlin.test.*                    // The following example works for JVM only
 
 class SampleTest {

blocks/main/why-kotlin/code-examples/ideal-for-tests.md

@@ -1,5 +1,5 @@
 url: https://github.com/JetBrains/kotlin/releases
 
 latest:
-  version: 2.1.21
-  url: https://github.com/JetBrains/kotlin/releases/tag/v2.1.21
+  version: 2.2.0
+  url: https://github.com/JetBrains/kotlin/releases/tag/v2.2.0