Merge remote-tracking branch 'refs/remotes/JetBrains/master'

# Conflicts: # .idea/inspectionProfiles/Project_Default.xml # docs/topics/arrays.md # docs/topics/basic-syntax.md # docs/topics/booleans.md # docs/topics/characters.md # docs/topics/classes.md # docs/topics/coding-conventions.md # docs/topics/command-line.md # docs/topics/contribute.md # docs/topics/control-flow.md # docs/topics/cross-platform-frameworks.md # docs/topics/cross-platform-mobile-development.md # docs/topics/data-classes.md # docs/topics/data-science-overview.md # docs/topics/equality.md # docs/topics/faq.md # docs/topics/generics.md # docs/topics/getting-started.md # docs/topics/gradle/get-started-with-jvm-gradle-project.md # docs/topics/gradle/gradle-compiler-options.md # docs/topics/gradle/gradle-configure-project.md # docs/topics/home.xml # docs/topics/idioms.md # docs/topics/iterators.md # docs/topics/js/js-project-setup.md # docs/topics/jvm/comparison-to-java.md # docs/topics/jvm/java-to-kotlin-interop.md # docs/topics/jvm/jvm-spring-boot-add-db-support.md # docs/topics/kotlin-doc.md # docs/topics/kotlin-osgi.md # docs/topics/maven.md # docs/topics/multiplatform/multiplatform-add-dependencies.md # docs/topics/multiplatform/multiplatform-introduce-your-team.md # docs/topics/multiplatform/multiplatform-publish-lib.md # docs/topics/native-and-cross-platform.md # docs/topics/native/apple-framework.md # docs/topics/native/native-get-started.md # docs/topics/native/native-libraries.md # docs/topics/native/native-objc-interop.md # docs/topics/numbers.md # docs/topics/roadmap.md # docs/topics/sealed-classes.md # docs/topics/strings.md # docs/topics/type-safe-builders.md # docs/topics/unsigned-integer-types.md # docs/topics/visibility-modifiers.md # docs/topics/wasm/wasm-libraries.md # docs/topics/whatsnew11.md # docs/topics/whatsnew14.md # docs/topics/whatsnew1720.md # docs/topics/whatsnew19.md # docs/v.list # templates/pages/videos.html
hltj · May 1, 2024 · 55d5459 · 55d5459
2 parents e5b1507 + b6dbc33
commit 55d5459
Show file tree

Hide file tree

Showing 545 changed files with 36,586 additions and 3,381 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,6 @@ out/
 _assets
 ~$*
 .DS_Store/
-.idea/workspace.xml
-.idea/uiDesigner.xml
 ~$*
 lib/kotlin-runtime.jar
 _site/
@@ -37,14 +35,15 @@ pdf/kotlin-reference.pdf
 pdf/tmp.html
 *.pyc
 google-credentials.json
-package-lock.json
+./package-lock.json
 .env
 pages/api/
 external/
 assets/externals
 pages/docs/tutorials/kotlin-for-py/
 _teamcity
 dist
+libs
 generated
 .next
 .teamcity/*.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlin-web-site.iml b/.idea/kotlin-web-site.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/.teamcity/BuildParams.kt b/.teamcity/BuildParams.kt
@@ -1,10 +1,10 @@
 object BuildParams {
   const val DOKKA_TEMPLATES_VERSION = "1.9.10"
 
-  const val KOTLINX_COROUTINES_RELEASE_TAG = "1.7.1"
-  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.6.2"
-  const val KOTLINX_DATETIME_RELEASE_TAG = "v0.4.0"
-  const val KOTLINX_METADATA_JVM_RELEASE_TAG = "v0.7.0"
+  const val KOTLINX_COROUTINES_RELEASE_TAG = "1.8.0"
+  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.6.3"
+  const val KOTLINX_DATETIME_RELEASE_TAG = "v0.6.0-RC"
+  const val KOTLINX_METADATA_JVM_RELEASE_TAG = "v0.9.0"
 
   const val SEARCH_APP_ID = "7961PKYRXV"
   const val SEARCH_INDEX_NAME = "prod_KOTLINLANG_WEBHELP"

diff --git a/.teamcity/builds/apiReferences/BuildApiReferencesProject.kt b/.teamcity/builds/apiReferences/BuildApiReferencesProject.kt
@@ -6,21 +6,22 @@ import builds.apiReferences.kotlinx.coroutines.KotlinxCoroutinesPrepareDokkaTemp
 import builds.apiReferences.kotlinx.datetime.KotlinxDatetimeBuildApiReference
 import builds.apiReferences.kotlinx.datetime.KotlinxDatetimeBuildSearchIndex
 import builds.apiReferences.kotlinx.datetime.KotlinxDatetimePrepareDokkaTemplates
-import builds.apiReferences.kotlinx.serialization.KotlinxSerializationBuildApiReference
-import builds.apiReferences.kotlinx.serialization.KotlinxSerializationBuildSearchIndex
-import builds.apiReferences.kotlinx.serialization.KotlinxSerializationPrepareDokkaTemplates
 import builds.apiReferences.kotlinx.metadataJvm.KotlinxMetadataJvmBuildApiReference
 import builds.apiReferences.kotlinx.metadataJvm.KotlinxMetadataJvmBuildSearchIndex
 import builds.apiReferences.kotlinx.metadataJvm.KotlinxMetadataJvmPrepareDokkaTemplates
+import builds.apiReferences.kotlinx.serialization.KotlinxSerializationBuildApiReference
+import builds.apiReferences.kotlinx.serialization.KotlinxSerializationBuildSearchIndex
+import builds.apiReferences.kotlinx.serialization.KotlinxSerializationPrepareDokkaTemplates
 import builds.apiReferences.stdlib.BuildStdlibApiReference
+import builds.apiReferences.stdlib.StdlibBuildSearchIndex
 import builds.apiReferences.stdlib.StdlibPrepareDokkaTemplates
 import builds.apiReferences.templates.BuildApiReference
 import builds.apiReferences.templates.BuildApiReferenceSearchIndex
 import builds.apiReferences.templates.PrepareDokkaTemplate
+import builds.apiReferences.vcsRoots.KotlinMetadataJvm
 import builds.apiReferences.vcsRoots.KotlinxCoroutines
-import builds.apiReferences.vcsRoots.KotlinxSerialization
 import builds.apiReferences.vcsRoots.KotlinxDatetime
-import builds.apiReferences.vcsRoots.KotlinMetadataJvm
+import builds.apiReferences.vcsRoots.KotlinxSerialization
 import jetbrains.buildServer.configs.kotlin.Project
 
 object BuildApiReferencesProject : Project({
@@ -44,6 +45,7 @@ object BuildApiReferencesProject : Project({
   buildType(KotlinxMetadataJvmPrepareDokkaTemplates)
 
   buildType(BuildStdlibApiReference)
+  buildType(StdlibBuildSearchIndex)
   buildType(StdlibPrepareDokkaTemplates)
 
   vcsRoot(KotlinxSerialization)

diff --git a/.teamcity/builds/apiReferences/extensions.kt b/.teamcity/builds/apiReferences/extensions.kt
@@ -7,10 +7,9 @@ import jetbrains.buildServer.configs.kotlin.FailureAction
 fun Dependencies.dependsOnDokkaTemplate(build: BuildType, artifactPath: String = "dokka-templates") {
   dependency(build) {
     snapshot {
-      onDependencyFailure = FailureAction.CANCEL
+      onDependencyFailure = FailureAction.FAIL_TO_START
       onDependencyCancel = FailureAction.CANCEL
     }
-
     artifacts {
       artifactRules = "+:dokka-templates/** => $artifactPath"
     }
@@ -20,10 +19,9 @@ fun Dependencies.dependsOnDokkaTemplate(build: BuildType, artifactPath: String =
 fun Dependencies.dependsOnDokkaPagesJson(build: BuildType) {
   dependency(build) {
     snapshot {
-      onDependencyFailure = FailureAction.CANCEL
+      onDependencyFailure = FailureAction.FAIL_TO_START
       onDependencyCancel = FailureAction.CANCEL
     }
-
     artifacts {
       artifactRules = "+:pages.zip!scripts/pages.json => api-references"
     }

diff --git a/.teamcity/builds/apiReferences/kotlinx/metadataJvm/KotlinxMetadataJvmBuildApiReference.kt b/.teamcity/builds/apiReferences/kotlinx/metadataJvm/KotlinxMetadataJvmBuildApiReference.kt
@@ -72,7 +72,7 @@ object KotlinxMetadataJvmBuildApiReference : BuildType({
         script {
             name = "build api reference"
             scriptContent = """
-                ./gradlew :kotlinx-metadata-jvm:dokkaHtml -PkotlinxMetadataDeployVersion=${KOTLINX_METADATA_JVM_RELEASE_TAG}
+                ./gradlew :kotlinx-metadata-jvm:dokkaHtml -PkotlinxMetadataDeployVersion=${KOTLINX_METADATA_JVM_RELEASE_TAG} --no-daemon
             """.trimIndent()
         }
     }