Skip to content

Commit 399d3cc

Browse files
Merge branch 'master' into kug-inclusion-kotlin-devs-brasil
2 parents 1a2e258 + 9928594 commit 399d3cc

File tree

10 files changed

+258
-2225
lines changed

10 files changed

+258
-2225
lines changed

.teamcity/BuildParams.kt

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

4-
const val KOTLINX_COROUTINES_RELEASE_TAG = "1.8.1"
4+
const val KOTLINX_COROUTINES_RELEASE_TAG = "1.9.0-RC"
55
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"

assets/kotlin-reference.pdf

27.6 MB
Binary file not shown.

docs/images/multiplatform/project-structure/common-code-diagram.svg

Lines changed: 15 additions & 95 deletions
Loading

docs/images/multiplatform/project-structure/compilation-jvm-diagram.svg

Lines changed: 32 additions & 226 deletions
Loading

docs/images/multiplatform/project-structure/intermediate-source-sets-diagram.svg

Lines changed: 67 additions & 350 deletions
Loading

docs/images/multiplatform/project-structure/native-executables-diagram.svg

Lines changed: 40 additions & 216 deletions
Loading

docs/images/multiplatform/project-structure/specific-target-diagram.svg

Lines changed: 52 additions & 1057 deletions
Loading

docs/images/multiplatform/project-structure/target-diagram.svg

Lines changed: 20 additions & 130 deletions
Loading

docs/images/multiplatform/project-structure/target-labels-diagram.svg

Lines changed: 25 additions & 144 deletions
Loading

docs/topics/delegation.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class BaseImpl(val x: Int) : Base {
1717
class Derived(b: Base) : Base by b
1818

1919
fun main() {
20-
val b = BaseImpl(10)
21-
Derived(b).print()
20+
val base = BaseImpl(10)
21+
Derived(base).print()
2222
}
2323
```
2424
{kotlin-runnable="true"}
@@ -48,9 +48,9 @@ class Derived(b: Base) : Base by b {
4848
}
4949

5050
fun main() {
51-
val b = BaseImpl(10)
52-
Derived(b).printMessage()
53-
Derived(b).printMessageLine()
51+
val base = BaseImpl(10)
52+
Derived(base).printMessage()
53+
Derived(base).printMessageLine()
5454
}
5555
```
5656
{kotlin-runnable="true"}
@@ -64,7 +64,7 @@ interface Base {
6464
fun print()
6565
}
6666

67-
class BaseImpl(val x: Int) : Base {
67+
class BaseImpl(x: Int) : Base {
6868
override val message = "BaseImpl: x = $x"
6969
override fun print() { println(message) }
7070
}

0 commit comments

Comments
 (0)