Skip to content

Commit 7e895fc

Browse files
committed
Update Kotlin to 1.3.60
1 parent 1fd56f2 commit 7e895fc

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=1.3.2) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.3.2)
66

77
Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
8-
This is a companion version for Kotlin `1.3.50` release.
8+
This is a companion version for Kotlin `1.3.60` release.
99

1010
```kotlin
1111
suspend fun main() = coroutineScope {
@@ -90,7 +90,7 @@ And make sure that you use the latest Kotlin version:
9090

9191
```xml
9292
<properties>
93-
<kotlin.version>1.3.50</kotlin.version>
93+
<kotlin.version>1.3.60</kotlin.version>
9494
</properties>
9595
```
9696

@@ -108,7 +108,7 @@ And make sure that you use the latest Kotlin version:
108108

109109
```groovy
110110
buildscript {
111-
ext.kotlin_version = '1.3.50'
111+
ext.kotlin_version = '1.3.60'
112112
}
113113
```
114114

@@ -134,7 +134,7 @@ And make sure that you use the latest Kotlin version:
134134

135135
```groovy
136136
plugins {
137-
kotlin("jvm") version "1.3.50"
137+
kotlin("jvm") version "1.3.60"
138138
}
139139
```
140140

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
# Kotlin
66
version=1.3.2-SNAPSHOT
77
group=org.jetbrains.kotlinx
8-
kotlin_version=1.3.50
8+
kotlin_version=1.3.60
99

1010
# Dependencies
1111
junit_version=4.12
12-
atomicfu_version=0.13.2
12+
atomicfu_version=0.14.1
1313
html_version=0.6.8
1414
lincheck_version=2.0
1515
dokka_version=0.9.16-rdev-2-mpp-hacks

gradle/compile-native-multiplatform.gradle

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,42 @@
1+
project.ext.nativeMainSets = []
2+
project.ext.nativeTestSets = []
3+
14
kotlin {
5+
targets.metaClass.addTarget = { preset ->
6+
def target = delegate.fromPreset(preset, preset.name)
7+
project.ext.nativeMainSets.add(target.compilations['main'].kotlinSourceSets.first())
8+
project.ext.nativeTestSets.add(target.compilations['test'].kotlinSourceSets.first())
9+
}
10+
211
targets {
312
if (project.ext.ideaActive) {
413
fromPreset(project.ext.ideaPreset, 'native')
514
} else {
6-
fromPreset(presets.linuxX64, 'linuxX64')
7-
fromPreset(presets.iosArm64, 'iosArm64')
8-
fromPreset(presets.iosArm32, 'iosArm32')
9-
fromPreset(presets.iosX64, 'iosX64')
10-
fromPreset(presets.macosX64, 'macosX64')
11-
fromPreset(presets.mingwX64, 'windowsX64')
15+
addTarget(presets.linuxX64)
16+
addTarget(presets.iosArm64)
17+
addTarget(presets.iosArm32)
18+
addTarget(presets.iosX64)
19+
addTarget(presets.macosX64)
20+
addTarget(presets.mingwX64)
21+
addTarget(presets.tvosArm64)
22+
addTarget(presets.tvosX64)
23+
addTarget(presets.watchosArm32)
24+
addTarget(presets.watchosArm64)
25+
addTarget(presets.watchosX86)
1226
}
1327
}
1428

1529
sourceSets {
1630
nativeMain { dependsOn commonMain }
17-
// Empty source set is required in order to have native tests task
31+
// Empty source set is required in order to have native tests task
1832
nativeTest {}
1933

2034
if (!project.ext.ideaActive) {
21-
configure([linuxX64Main, macosX64Main, windowsX64Main, iosArm32Main, iosArm64Main, iosX64Main]) {
35+
configure(nativeMainSets) {
2236
dependsOn nativeMain
2337
}
2438

25-
configure([linuxX64Test, macosX64Test, windowsX64Test, iosArm32Test, iosArm64Test, iosX64Test]) {
39+
configure(nativeTestSets) {
2640
dependsOn nativeTest
2741
}
2842
}

ui/kotlinx-coroutines-android/animation-app/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xmx1536m
2020
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
2121
# org.gradle.parallel=true
2222

23-
kotlin_version=1.3.50
23+
kotlin_version=1.3.60
2424
coroutines_version=1.3.2
2525

2626
android.useAndroidX=true

ui/kotlinx-coroutines-android/example-app/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xmx1536m
2020
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
2121
# org.gradle.parallel=true
2222

23-
kotlin_version=1.3.50
23+
kotlin_version=1.3.60
2424
coroutines_version=1.3.2
2525

2626
android.useAndroidX=true

0 commit comments

Comments
 (0)