Merge branch 'master' into patch-2

Author: zoobestik

.teamcity/BuildParams.kt

@@ -1,10 +1,10 @@
 object BuildParams {
   const val DOKKA_TEMPLATES_VERSION = "1.9.10"
 
-  const val KOTLINX_COROUTINES_RELEASE_TAG = "1.9.0-RC"
-  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.7.2"
-  const val KOTLINX_DATETIME_RELEASE_TAG = "v0.6.0"
-  const val KOTLINX_IO_RELEASE_TAG = "0.5.2"
+  const val KOTLINX_COROUTINES_RELEASE_TAG = "1.9.0"
+  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.7.3"
+  const val KOTLINX_DATETIME_RELEASE_TAG = "v0.6.1"
+  const val KOTLINX_IO_RELEASE_TAG = "0.5.4"
   const val KOTLIN_RELEASE_TAG = "v2.0.20"
 
   const val SEARCH_APP_ID = "7961PKYRXV"

.teamcity/builds/apiReferences/kotlinx/io/KotlinxIOBuildApiReference.kt

@@ -17,7 +17,7 @@ object KotlinxIOBuildApiReference : BuildType({
     artifactRules = "build/dokka/htmlMultiModule/** => pages.zip"
 
     params {
-        param("release.tag", KOTLINX_IO_RELEASE_TAG)
+        param("release.tag", KOTLINX_IO_RELEASE_TAG.removePrefix("v"))
     }
 
     vcs {

.teamcity/builds/apiReferences/vcsRoots/KotlinxIO.kt

@@ -6,7 +6,7 @@ import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
 object KotlinxIO : GitVcsRoot({
   name = "kotlinx-io vcs root"
   url = "[email protected]:Kotlin/kotlinx-io.git"
-  branch = "refs/heads/ktl-1576-kotlinlang-api-ref"
+  branch = "refs/tags/$KOTLINX_IO_RELEASE_TAG"
   branchSpec = """
         +:refs/heads/(*)
         +:refs/tags/(*)

.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt

@@ -5,6 +5,13 @@ import jetbrains.buildServer.configs.kotlin.BuildType
 import jetbrains.buildServer.configs.kotlin.*
 import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
+import java.io.File
+import java.nio.file.Paths
+
+private fun readScript(name: String): String {
+    val file = File(Paths.get("scripts/$name.mjs").toAbsolutePath().toString())
+    return file.readText()
+}
 
 object BuildReferenceDocs : BuildType({
   name = "Reference Docs"

.teamcity/builds/kotlinlang/templates/DockerImageBuilder.kt

@@ -34,15 +34,9 @@ object DockerImageBuilder : Template({
       onDependencyCancel = FailureAction.CANCEL
     }
 
-    dependency(BuildKotlinGrammar) {
-      snapshot {
-        onDependencyFailure = FailureAction.FAIL_TO_START
-        onDependencyCancel = FailureAction.CANCEL
-      }
-
-      artifacts {
-        artifactRules = "grammar.xml"
-      }
+    artifacts(BuildKotlinGrammar) {
+      buildRule = lastPinned("+:*")
+      artifactRules = "grammar.xml"
     }
   }
 })

blocks/main/foundation-preview/foundation-preview.module.css

@@ -83,23 +83,22 @@
     }
 }
 
-@media (--ktl-ds) {
+@media (--ktl-tl-min) {
     .foundationPreviewImage {
         right: -48px;
         top: -6px;
     }
 
     .companies {
         flex-wrap: wrap;
+        align-items: center;
         gap: 8px;
+        max-width: 684px;
     }
 
     .companyLogo {
         margin-right: 10px;
-    }
-
-    .companyLogo:nth-child(2) {
-        margin-right: 50%;
+        display: flex;
     }
 
     .buttonWrap {
@@ -160,4 +159,4 @@
     @media (--ktl-tl) {
         text-transform: none;
     }
-}
+}

blocks/main/hero/hero.module.css

@@ -4,25 +4,15 @@
     background: #19191C;
     padding: 48px 0;
     overflow: hidden;
-
-    @media (--ktl-ts-min) {
-        padding: 72px 0;
-    }
-
-    @media (--ktl-ds-min) {
-        padding: 96px 0;
-    }
-
-}
-
-.heroSection[data-optimizely-id='hero-ab'] {
     text-align: center;
     @media (--ktl-ts-min) {
+        padding: 72px 0;
         .content {
             margin-left: 38px;
         }
     }
     @media (--ktl-ds-min) {
+        padding: 96px 0;
         .content {
             margin-left: 90px;
         }
@@ -53,10 +43,8 @@
     .developerLogo {
         margin: 0;
     }
+
     .developerCaption {
-        display: none;
-    }
-    .developerCaptionAb {
         display: block;
         margin-right: 8px;
     }
@@ -275,15 +263,6 @@
     }
 }
 
-.developerCaption {
-    white-space: nowrap;
-    margin-left: 38px;
-}
-
-.developerCaptionAb {
-    display: none;
-}
-
 .getStartedButton {
     background: #7F52FF !important;
 

blocks/main/hero/hero.tsx

@@ -41,25 +41,14 @@ export const HeroSection: FC<Props> = ({ children, title }) => {
                                 </Button>
                                 <div className={styles.developer}>
                                     <div className={styles.developerContent}>
-                                        <div className={cn(darkTextCn('rs-text-2', { hardness: 'hard' }), styles.developerCaptionAb)}>Developed by</div>
+                                        <div className={cn(darkTextCn('rs-text-2', { hardness: 'hard' }), styles.developerCaption)}>Developed by</div>
                                         <a
                                             href="https://www.jetbrains.com/"
                                             target={'_blank'}
                                             rel={'noreferrer noopener'}
                                         >
                                             <img src={JBLogo.src} alt="jetbrains logo" className={styles.developerLogo} />{' '}
                                         </a>
-                                        <div className={cn(darkTextCn('rs-text-3', { hardness: 'hard' }), styles.developerCaption)}>
-                                            Kotlin, developed by&nbsp;
-                                            <a
-                                                href="https://www.jetbrains.com/"
-                                                className={darkTextCn('rs-link', { hardness: 'hard' })}
-                                                target={'_blank'}
-                                                rel={'noreferrer noopener'}
-                                            >
-                                                JetBrains
-                                            </a>.
-                                        </div>
                                     </div>
                                 </div>
                             </div>

data/events.yml

@@ -7,6 +7,14 @@
   title: 'Ko-Hacks'
   subject: 'Mutabilidade: Necessidade ou Hábito?'
   url: https://www.meetup.com/pt-BR/kotlin-lisboa/events/301917980/
+- lang: fr
+  startDate: '2024-10-22'
+  endDate: '2024-10-22'
+  location: Bordeaux, France
+  speaker: Salomon Brys
+  title: 'Bordeaux Kotlin User Group'
+  subject: 'Compose Multiplatform: State of the art, use-cases and limits'
+  url: https://www.eventbrite.fr/e/billets-compose-multiplatform-etat-de-lart-cas-dusages-et-limites-1018664130837
 - lang: en
   startDate: '2024-09-21'
   endDate: '2024-09-21'

data/releases.yml

@@ -1,5 +1,5 @@
 url: https://github.com/JetBrains/kotlin/releases
 
 latest:
-  version: 2.0.20
-  url: https://github.com/JetBrains/kotlin/releases/tag/v2.0.20
+  version: 2.0.21
+  url: https://github.com/JetBrains/kotlin/releases/tag/v2.0.21