Merge branch 'master' into patch-1

.gitignore

@@ -14,8 +14,6 @@ out/
 _assets
 ~$*
 .DS_Store/
-.idea/workspace.xml
-.idea/uiDesigner.xml
 ~$*
 lib/kotlin-runtime.jar
 _site/
@@ -37,7 +35,7 @@ pdf/kotlin-reference.pdf
 pdf/tmp.html
 *.pyc
 google-credentials.json
-package-lock.json
+./package-lock.json
 .env
 pages/api/
 external/

.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-RC"
-  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.6.2"
-  const val KOTLINX_DATETIME_RELEASE_TAG = "v0.5.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.7.0"
 
   const val SEARCH_APP_ID = "7961PKYRXV"

.teamcity/builds/kotlinlang/buidTypes/BuildJsAssets.kt

@@ -35,4 +35,14 @@ object BuildJsAssets: BuildType({
       dockerPull = true
     }
   }
+
+  dependencies {
+    artifacts(FetchBlogNews) {
+      buildRule = lastSuccessful(branch = "+:<default>")
+      artifactRules = """
+        +:latest-news.zip!** => latest-news/
+      """.trimIndent()
+      cleanDestination = true
+    }
+  }
 })

.teamcity/builds/kotlinlang/buidTypes/BuildSitePages.kt

@@ -8,8 +8,9 @@ import builds.kotlinlang.templates.DockerImageBuilder
 import jetbrains.buildServer.configs.kotlin.*
 import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.triggers.finishBuildTrigger
 
-const val kotlinWebsiteSetup = "/kotlin-website-setup.sh"
+private const val kotlinWebsiteSetup = "/kotlin-website-setup.sh"
 
 object BuildSitePages : BuildType({
   name = "Build site pages"
@@ -26,6 +27,14 @@ object BuildSitePages : BuildType({
     cleanCheckout = true
   }
 
+  triggers {
+    finishBuildTrigger {
+      buildType = FetchBlogNews.id?.value ?: error("Invalid FetchBlogNews ID")
+      branchFilter = "+:<default>"
+      successfulOnly = true
+    }
+  }
+
   steps {
     script {
       name = "Build html pages"
@@ -54,15 +63,15 @@ object BuildSitePages : BuildType({
     script {
       name = "Override with external source"
       scriptContent = """
-                cp -fR _webhelp/reference/* build/docs/
-                #cp -fR _webhelp/mobile build/docs/
-                mv build dist
-                cp -fR spec dist/
-                cp -fR _assets dist/
-                cp -fR out dist/
-                cp -fR out/_next dist/_next/
-                cp -fR libs/* dist/api/
-            """.trimIndent()
+        cp -fR _webhelp/reference/* build/docs/
+        #cp -fR _webhelp/mobile build/docs/
+        mv build dist
+        cp -fR spec dist/
+        cp -fR _assets dist/
+        cp -fR out/* dist/
+        cp -fR out/_next dist/_next/
+        cp -fR libs/* dist/api/
+      """.trimIndent()
       dockerImage = "alpine"
     }
 
@@ -125,6 +134,7 @@ object BuildSitePages : BuildType({
                 """.trimIndent()
       }
     }
+
     dependency(BuildReferenceDocs) {
       snapshot {
         onDependencyFailure = FailureAction.FAIL_TO_START