Skip to content

Commit 41176a0

Browse files
authored
chore: change the kotlin 2.0.0 mentions to the variable
1 parent 195332f commit 41176a0

File tree

5 files changed

+15
-31
lines changed

5 files changed

+15
-31
lines changed

mpd.tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</toc-element>
1717
<toc-element toc-title="What's new in Kotlin Multiplatform">
1818
<toc-element toc-title="What's new in Compose Multiplatform">
19-
<toc-element id="whats-new-compose-1610.md"/>
19+
<toc-element id="whats-new-compose-1610.md" accepts-web-file-names="whats-new-compose-eap.html"/>
2020
<toc-element id="whats-new-compose.md" accepts-web-file-names="whats-new-compose-1-6-0.html"/>
2121
</toc-element>
2222
<toc-element id="whats-new-fleet-1-31.md"/>

topics/compose/compose-compiler.md

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
[//]: # (title: Compose compiler)
22

3-
<!-- this tip should be moved lower and possibly reworded after the 2.0.0 release -->
4-
> The Compose compiler has been merged into the Kotlin repository since Kotlin 2.0.0-RC2.
5-
> This helps smooth the migration of your projects to Kotlin 2.0, as the Compose compiler will ship simultaneously
6-
> with Kotlin from now on and will always be compatible with Kotlin of the same version.
7-
>
8-
{type="tip"}
9-
103
The Compose compiler is supplemented by a Gradle plugin, which simplifies setup and offers
114
easier access to compiler options.
125
When applied with the Android Gradle plugin (AGP), this Compose compiler plugin will override the coordinates
136
of the Compose compiler supplied automatically by AGP.
147

8+
> The Compose compiler has been merged into the Kotlin repository since Kotlin %kotlinVersion%.
9+
> This helps smooth the migration of your projects to Kotlin %kotlinVersion%, as the Compose compiler ships simultaneously
10+
> simultaneously with Kotlin and will always be compatible with Kotlin of the same version.
11+
>
12+
{type="tip"}
13+
1514
To use it in your project, apply the plugin for each module that uses Compose. See the migration instructions below:
1615

1716
* [Migrating a Compose Multiplatform project](#migrating-a-compose-multiplatform-project)
@@ -20,15 +19,15 @@ To use it in your project, apply the plugin for each module that uses Compose. S
2019

2120
## Migrating a Compose Multiplatform project
2221

23-
Starting with 1.6.10, you should apply the `org.jetbrains.kotlin.plugin.compose` Gradle plugin to each
22+
Starting with Compose Multiplatform 1.6.10, you should apply the `org.jetbrains.kotlin.plugin.compose` Gradle plugin to each
2423
module that uses the `org.jetbrains.compose` plugin:
2524

2625
1. Add the Compose compiler Gradle plugin to the [Gradle version catalog](https://docs.gradle.org/current/userguide/platforms.html#sub:conventional-dependencies-toml):
2726

2827
```toml
2928
[versions]
3029
# ...
31-
kotlin = "2.0.0-RC2"
30+
kotlin = "%kotlinVersion%"
3231

3332
[plugins]
3433
# ...
@@ -73,22 +72,7 @@ When switching from Kotlin 1.9.0 to 2.0.0, or from 2.0.0 to 1.9.0, you may encou
7372
org.jetbrains.compose.resources.MissingResourceException: Missing resource with path: ...
7473
```
7574
76-
To resolve this, delete all of the `build` directories: at the root of your project and in each of the modules.
77-
78-
### Test with the stable Compose Multiplatform
79-
80-
To try the Compose compiler 2.0.0 with the stable version of Compose Multiplatform (1.6.2 or older), use this configuration:
81-
82-
```kotlin
83-
compose {
84-
kotlinCompilerPlugin = "org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.0.0-RC2"
85-
}
86-
```
87-
88-
> This configuration will be deprecated with the stable 1.6.10 release:
89-
> you will have to apply the `org.jetbrains.kotlin.plugin.compose` plugin instead.
90-
>
91-
{type="note"}
75+
To resolve this, delete all of the `build` directories: at the root of your project and in each of the modules.
9276
9377
## Migrating a Jetpack Compose project
9478
@@ -99,7 +83,7 @@ For Android modules that do not rely on Compose Multiplatform:
9983
```toml
10084
[versions]
10185
# ...
102-
kotlin = "2.0.0-RC2"
86+
kotlin = "%kotlinVersion%"
10387
10488
[plugins]
10589
# ...

topics/development/multiplatform-spm-local-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ in your Xcode project.
1111

1212
## Set up the project
1313

14-
The feature is available starting with Kotlin 2.0.0-Beta2.
14+
The feature is available starting with Kotlin 2.0.0.
1515

16-
If you still haven't upgraded to Kotlin 2.0, you can use a special Kotlin version, `1.9.24-spm` from the
16+
If you still haven't upgraded to Kotlin 2.0.0, you can use a special Kotlin version, `1.9.24-spm` from the
1717
`https://packages.jetbrains.team/maven/p/mpp/dev` Maven repository. You can add the repository, for instance,
1818
in your `settings.gradle.kts`:
1919

topics/whats-new/whats-new-compose-eap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Starting with Compose Multiplatform 1.6.10-beta01,
4343
you can store resources in any Gradle module and in any source set, as well as publish projects and libraries
4444
with resources included.
4545

46-
To enable multimodule support, update your project to Kotlin version 2.0.0-Beta5 or newer and Gradle 7.6 or newer.
46+
To enable multimodule support, update your project to Kotlin version 2.0.0 or newer and Gradle 7.6 or newer.
4747

4848
#### Configuration DSL for multiplatform resources
4949

v.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<var name="composeEapVersion" value="1.6.10" type="string"/>
1010

11-
<var name="kotlinVersion" value="1.9.23" type="string"/>
11+
<var name="kotlinVersion" value="2.0.0" type="string"/>
1212

1313
<var name="coroutinesVersion" value="1.7.3" type="string"/>
1414

0 commit comments

Comments
 (0)