Skip to content

Commit e82231d

Browse files
Merge branch 'master' into kug-inclusion-kotlin-devs-brasil
2 parents d6c57e7 + 44bf571 commit e82231d

File tree

75 files changed

+4356
-619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+4356
-619
lines changed

.github/workflows/verify-samples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
java-version: '17'
1616
distribution: 'zulu'
1717
- name: Run a verifier
18-
uses: AlexanderPrendota/kotlin-samples-verifier@master
18+
uses: zoobestik/kotlin-samples-verifier@master
1919
with:
2020
push-repository: 'https://github.com/JetBrains/kotlin-compiler-server'
2121
tag-filter: '#tag="code" & kotlin-runnable="true" & !validate="false"'

.teamcity/BuildParams.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ object BuildParams {
22
const val DOKKA_TEMPLATES_VERSION = "1.9.10"
33

44
const val KOTLINX_COROUTINES_RELEASE_TAG = "1.8.1"
5-
const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.6.3"
5+
const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.7.0-RC"
66
const val KOTLINX_DATETIME_RELEASE_TAG = "v0.6.0"
77
const val KOTLINX_METADATA_JVM_RELEASE_TAG = "v0.9.0"
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ object BuildSitePages : BuildType({
144144
}
145145
}
146146

147-
artifacts(AbsoluteId("Kotlin_KotlinRelease_1920_LibraryReferenceLegacyDocs")) {
147+
artifacts(AbsoluteId("Kotlin_KotlinRelease_200_LibraryReferenceLegacyDocs")) {
148148
buildRule = tag("publish", """
149149
+:<default>
150150
+:*

assets/jetbrains-logo.svg

Lines changed: 12 additions & 13 deletions
Loading

assets/kotlin-reference.pdf

-20.5 MB
Binary file not shown.

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

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
.companies {
6262
flex-wrap: wrap;
63-
justify-content: center;
63+
justify-content: space-evenly;
6464
margin-top: 48px;
6565
max-width: 376px;
6666
}
@@ -88,6 +88,23 @@
8888
right: -48px;
8989
top: -6px;
9090
}
91+
92+
.companies {
93+
flex-wrap: wrap;
94+
gap: 8px;
95+
}
96+
97+
.companyLogo {
98+
margin-right: 10px;
99+
}
100+
101+
.companyLogo:nth-child(2) {
102+
margin-right: 50%;
103+
}
104+
105+
.buttonWrap {
106+
align-self: flex-end;
107+
}
91108
}
92109

93110
@media (--ktl-tl) {
@@ -97,6 +114,14 @@
97114
bottom: -120px;
98115
transform: rotate(115deg);
99116
}
117+
118+
.buttonWrap {
119+
align-self: center;
120+
}
121+
122+
.companyLogo:nth-child(2) {
123+
margin-right: 0;
124+
}
100125
}
101126

102127
@media (--ktl-tm) {
@@ -117,4 +142,22 @@
117142
margin-right: -24px;
118143
border-radius: 0;
119144
}
145+
}
146+
147+
.responsiveHidden {
148+
@media (--ktl-ds) {
149+
display: none;
150+
}
151+
@media (--ktl-tl) {
152+
display: initial;
153+
}
154+
}
155+
156+
.responsiveCapitalized {
157+
@media (--ktl-ds) {
158+
text-transform: capitalize;
159+
}
160+
@media (--ktl-tl) {
161+
text-transform: none;
162+
}
120163
}

blocks/main/foundation-preview/foundation-preview.tsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import React, { FC, ReactNode } from "react";
22

3+
import { ArrowTopRightIcon } from '@rescui/icons';
4+
import { Button } from '@rescui/button';
35
import { useTextStyles } from '@rescui/typography';
46
import classNames from 'classnames';
57

@@ -48,3 +50,19 @@ export const FoundationPreview: FC<FoundationPreviewProps> = ({title, descriptio
4850
</div>
4951
);
5052
}
53+
54+
export const FoundationLearnMoreButton: FC = () => (
55+
<Button
56+
href="https://kotlinfoundation.org/"
57+
size="l"
58+
mode="rock"
59+
theme="light"
60+
icon={<ArrowTopRightIcon />}
61+
iconPosition="right"
62+
>
63+
<span>
64+
<span className={styles.responsiveHidden}>Learn&nbsp;</span>
65+
<span className={styles.responsiveCapitalized}>more</span>
66+
</span>
67+
</Button>
68+
);

blocks/main/hero/hero.module.css

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@
117117
}
118118

119119
.developer {
120-
display: flex;
121-
align-items: center;
122120
margin-left: 24px;
123121
padding-left: 24px;
124122
border-left: 1px solid rgba(255, 255, 255, 0.20);
125123

126124
@media (--ktl-ts) {
127125
box-sizing: border-box;
126+
display: flex;
127+
align-items: center;
128128
justify-content: center;
129129
width: 100%;
130130
border: 0;
@@ -148,10 +148,25 @@
148148
}
149149
}
150150

151+
.developerContent {
152+
@media (--ktl-ts) {
153+
display: flex;
154+
flex-direction: column;
155+
align-items: flex-start;
156+
}
157+
}
158+
151159
.developerLogo {
152-
margin-right: 12px;
153-
height: 52px;
154-
width: 52px;
160+
margin-bottom: -5px;
161+
162+
@media (--ktl-ts) {
163+
margin-bottom: 0;
164+
}
165+
}
166+
167+
.developerCaption {
168+
white-space: nowrap;
169+
margin-left: 38px;
155170
}
156171

157172
.getStartedButton {

blocks/main/hero/hero.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,19 @@ export const HeroSection: FC<Props> = ({ children, title }) => {
4040
Get started
4141
</Button>
4242
<div className={styles.developer}>
43-
<img src={JBLogo.src} alt="jetbrains logo" className={styles.developerLogo} />{' '}
44-
<div className={darkTextCn('rs-text-3', { hardness: 'hard' })}>
45-
Developed by&nbsp;
46-
<a
47-
href="https://www.jetbrains.com/"
48-
className={darkTextCn('rs-link', { hardness: 'hard' })}
49-
target={'_blank'}
50-
rel={'noreferrer noopener'}
51-
>
52-
JetBrains
53-
</a>.
43+
<div className={styles.developerContent}>
44+
<img src={JBLogo.src} alt="jetbrains logo" className={styles.developerLogo} />{' '}
45+
<div className={cn(darkTextCn('rs-text-3', { hardness: 'hard' }), styles.developerCaption)}>
46+
Kotlin, developed by&nbsp;
47+
<a
48+
href="https://www.jetbrains.com/"
49+
className={darkTextCn('rs-link', { hardness: 'hard' })}
50+
target={'_blank'}
51+
rel={'noreferrer noopener'}
52+
>
53+
JetBrains
54+
</a>.
55+
</div>
5456
</div>
5557
</div>
5658
</div>

data/releases.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
url: https://github.com/JetBrains/kotlin/releases
22

33
latest:
4-
version: 1.9.24
5-
url: https://github.com/JetBrains/kotlin/releases/tag/v1.9.24
6-
4+
version: 2.0.0
5+
url: https://github.com/JetBrains/kotlin/releases/tag/v2.0.0

0 commit comments

Comments
 (0)