Skip to content

Commit 201790c

Browse files
authored
Merge branch 'master' into tests-for-api-button
2 parents ec42481 + d9734bb commit 201790c

File tree

8 files changed

+522
-22
lines changed

8 files changed

+522
-22
lines changed

docs/images/multiplatform/diagrams/default-hierarchy-example-with-web.svg

Lines changed: 46 additions & 0 deletions
Loading

docs/kr.tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</toc-element>
3535
<toc-element toc-title="What's new in Kotlin">
3636
<toc-element toc-title="Kotlin 2.2.0" accepts-web-file-names="whatsnew.html" topic="whatsnew22.md"/>
37-
<toc-element toc-title="Kotlin 2.2.20-Beta1" topic="whatsnew-eap.md"/>
37+
<toc-element toc-title="Kotlin 2.2.20-Beta2" topic="whatsnew-eap.md"/>
3838
<toc-element toc-title="Earlier versions">
3939
<toc-element toc-title="Kotlin 2.1.20" topic="whatsnew2120.md"/>
4040
<toc-element toc-title="Kotlin 2.1.0" topic="whatsnew21.md"/>

docs/topics/eap.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ In this channel, you can also get notifications about new EAP builds.
5252
<th>Build highlights</th>
5353
</tr>
5454
<tr>
55-
<td><strong>2.2.20-Beta1</strong>
56-
<p>Released: <strong>July 10, 2025</strong></p>
57-
<p><a href="https://github.com/JetBrains/kotlin/releases/tag/v2.2.20-Beta1" target="_blank">Release on GitHub</a></p>
55+
<td><strong>2.2.20-Beta2</strong>
56+
<p>Released: <strong>July 29, 2025</strong></p>
57+
<p><a href="https://github.com/JetBrains/kotlin/releases/tag/v2.2.20-Beta2" target="_blank">Release on GitHub</a></p>
5858
</td>
5959
<td>
6060
<p>A tooling release containing improvements and bug fixes.</p>
61-
<p>For more details, please refer to the <a href="https://github.com/JetBrains/kotlin/releases/tag/v2.2.20-Beta1">changelog</a> or <a href="whatsnew-eap.md">What's new in Kotlin 2.2.20-Beta1</a>.</p>
61+
<p>For more details, please refer to the <a href="https://github.com/JetBrains/kotlin/releases/tag/v2.2.20-Beta2">changelog</a> or <a href="whatsnew-eap.md">What's new in Kotlin 2.2.20-Beta2</a>.</p>
6262
</td>
6363
</tr>
6464
<tr>

docs/topics/tour/kotlin-tour-intermediate-open-special-classes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ In the example:
382382
* `Email` is an inline value class that has one property in the class header: `address`.
383383
* The `sendEmail()` function accepts objects with type `Email` and prints a string to the standard output.
384384
* The `main()` function:
385-
* Creates an instance of the `Email` class called `email`.
386-
* Calls the `sendEmail()` function on the `email` object.
385+
* Creates an instance of the `Email` class called `myEmail`.
386+
* Calls the `sendEmail()` function on the `myEmail` object.
387387

388388
By using an inline value class, you make the class inlined and can use it directly in your code without creating an object.
389389
This can significantly reduce memory footprint and improve your code's runtime performance.

docs/topics/whatsnew/whatsnew-eap.md

Lines changed: 456 additions & 12 deletions
Large diffs are not rendered by default.

docs/v.list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<var name="apiVersion" value="2.1" type="string"/>
1515

1616
<!-- Kotlin EAP -->
17-
<var name="kotlinEapVersion" value="2.2.20-Beta1" type="string"/>
18-
<var name="kotlinEapReleaseDate" value="July 10, 2025" type="string"/>
17+
<var name="kotlinEapVersion" value="2.2.20-Beta2" type="string"/>
18+
<var name="kotlinEapReleaseDate" value="July 29, 2025" type="string"/>
1919

2020
<!-- Libraries and Frameworks -->
2121
<var name="coroutinesVersion" value="1.10.2" type="string"/>

static/js/util/map-settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const settings = {
2-
key: 'AIzaSyAMF-gJllft62W5l9xfgE6DBhaa6YmIJs0',
2+
key: 'AIzaSyD4Lyv4gCOMhDlWrdlcn3pOLSwCpnDtn9k',
33
defaultCenter: {
44
lat: 20,
55
lng: 0

test/production/main-page-buttons.spec.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ test.describe('Main page buttons', () => {
1616
await expect(pageTitle).toContainText('Get started with Kotlin');
1717
});
1818

19+
test('Develop by JetBrains link should navigate to JetBrains homepage', async ({ page, context }) => {
20+
const jetBrainsLink = page.getByTestId('hero-block').getByRole('link', { name: 'JetBrains' });
21+
await expect(jetBrainsLink).toBeVisible();
22+
const newPagePromise = context.waitForEvent('page');
23+
await jetBrainsLink.click();
24+
const newPage = await newPagePromise;
25+
await newPage.waitForLoadState();
26+
await expect(newPage.url()).toContain('https://www.jetbrains.com/');
27+
});
28+
1929
test('Kotlin blog button', async ({ page }) => {
2030
const blogButton = page.getByRole('link', { name: 'Kotlin blog' });
2131
await expect(blogButton).toBeVisible();

0 commit comments

Comments
 (0)