Merge branch 'master' into edrd-f/code-conventions-update

JetBrains · May 27, 2024 · bd5bedf · bd5bedf
2 parents d865b2d + ae931c8
commit bd5bedf
Show file tree

Hide file tree

Showing 130 changed files with 32,238 additions and 937 deletions.
diff --git a/.github/workflows/verify-samples.yml b/.github/workflows/verify-samples.yml
@@ -15,7 +15,7 @@ jobs:
           java-version: '17'
           distribution: 'zulu'
       - name: Run a verifier
-        uses: AlexanderPrendota/kotlin-samples-verifier@master
+        uses: zoobestik/kotlin-samples-verifier@master
         with:
           push-repository: 'https://github.com/JetBrains/kotlin-compiler-server'
           tag-filter: '#tag="code" & kotlin-runnable="true" & !validate="false"'

diff --git a/.teamcity/BuildParams.kt b/.teamcity/BuildParams.kt
@@ -1,9 +1,9 @@
 object BuildParams {
   const val DOKKA_TEMPLATES_VERSION = "1.9.10"
 
-  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_COROUTINES_RELEASE_TAG = "1.8.1"
+  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.7.0-RC"
+  const val KOTLINX_DATETIME_RELEASE_TAG = "v0.6.0"
   const val KOTLINX_METADATA_JVM_RELEASE_TAG = "v0.9.0"
 
   const val SEARCH_APP_ID = "7961PKYRXV"

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/stdlib/BuildStdlibApiReference.kt b/.teamcity/builds/apiReferences/stdlib/BuildStdlibApiReference.kt
@@ -2,21 +2,43 @@ package builds.apiReferences.stdlib
 
 import jetbrains.buildServer.configs.kotlin.*
 import jetbrains.buildServer.configs.kotlin.BuildType
+import jetbrains.buildServer.configs.kotlin.buildSteps.script
 
 object BuildStdlibApiReference : BuildType({
   name = "Stdlib Api reference"
-  artifactRules = "latest-version.zip"
+  artifactRules = """
+      +:content/** => latest-version.zip
+      +:pages.json => ./
+  """.trimIndent()
+
+  steps {
+      script {
+          name = "Drop unnecessary files"
+          // language=bash
+          scriptContent = """
+              ls -la ./
+              ls -la ./content/
+              ls -la ./content/all-libs/
+
+              rm ./content/all-libs/not-found-version.html
+              
+              # empty pages.json
+              mv ./content/all-libs/scripts/pages.json ./
+              echo "[]" > ./content/all-libs/scripts/pages.json
+          """.trimIndent()
+      }
+  }
 
   dependencies {
       dependency(AbsoluteId("Kotlin_KotlinRelease_1920_LibraryReferenceLatestDocs")) {
-      snapshot {
-        reuseBuilds = ReuseBuilds.SUCCESSFUL
-        onDependencyFailure = FailureAction.FAIL_TO_START
-      }
-      artifacts {
-        cleanDestination = true
-        artifactRules = "latest-version.zip"
-      }
+          artifacts {
+              buildRule = tag(tag = "publish", branch = """
+                  +:<default>
+                  +:*
+              """.trimIndent())
+              cleanDestination = true
+              artifactRules = "+:latest-version.zip!** => content/"
+          }
     }
   }
 })
diff --git a/.teamcity/builds/apiReferences/stdlib/StdlibBuildSearchIndex.kt b/.teamcity/builds/apiReferences/stdlib/StdlibBuildSearchIndex.kt
@@ -21,7 +21,7 @@ object StdlibBuildSearchIndex : BuildType({
                 onDependencyCancel = FailureAction.CANCEL
             }
             artifacts {
-                artifactRules = "+:latest-version.zip!all-libs/scripts/pages.json => api-references"
+                artifactRules = "+:pages.json => api-references/"
             }
         }
     }

diff --git a/.teamcity/builds/apiReferences/stdlib/StdlibPrepareDokkaTemplates.kt b/.teamcity/builds/apiReferences/stdlib/StdlibPrepareDokkaTemplates.kt
@@ -13,5 +13,8 @@ object StdlibPrepareDokkaTemplates: BuildType({
 
   params {
     param("env.ALGOLIA_INDEX_NAME", "api-core")
+    param("env.DOKKA_NOINDEX", "true")
+    param("env.DOKKA_CUSTOM_BODY", "core-api")
+    param("env.DOKKA_FEEDBACK", "true")
   }
 })
diff --git a/.teamcity/builds/apiReferences/templates/BuildApiReference.kt b/.teamcity/builds/apiReferences/templates/BuildApiReference.kt
@@ -8,7 +8,6 @@ import jetbrains.buildServer.configs.kotlin.Triggers
 import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.triggers.VcsTrigger
-import jetbrains.buildServer.configs.kotlin.triggers.vcs
 
 fun BuildSteps.scriptDropSnapshot(block: ScriptBuildStep.() -> Unit) = step(
     ScriptBuildStep {
@@ -60,7 +59,6 @@ object BuildApiReference : Template({
     artifactRules = "build/dokka/htmlMultiModule/** => pages.zip"
 
     params {
-        param("teamcity.vcsTrigger.runBuildInNewEmptyBranch", "true")
         param("DOKKA_TEMPLATES_VERSION", DOKKA_TEMPLATES_VERSION)
     }
 

diff --git a/.teamcity/builds/apiReferences/templates/PrepareDokkaTemplate.kt b/.teamcity/builds/apiReferences/templates/PrepareDokkaTemplate.kt
@@ -5,13 +5,12 @@ import jetbrains.buildServer.configs.kotlin.buildSteps.script
 
 object PrepareDokkaTemplate: Template({
   name = "Build Custom HTML Template"
+  artifactRules = "dokka-templates/** => dokka-templates"
 
   vcs {
     root(vcsRoots.KotlinLangOrg)
   }
 
-  artifactRules = "dokka-templates/** => dokka-templates"
-
   steps {
     script {
       name = "Fix npm sharp platform related issue"

diff --git a/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt b/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt
@@ -18,7 +18,7 @@ object BuildReferenceDocs : BuildType({
   """.trimIndent()
 
   params {
-    param("WEBHELP_FRONTEND_VERSION", "6.4.0-x-icon-plus-links")
+    param("WEBHELP_FRONTEND_VERSION", "6.11.0-footer")
     param("WH_DOCS_PATH_REGEX", "docs")
     param("WH_PROJECT_NAME", "kotlin-reference")
   }